diff options
author | Steve Block <steveblock@google.com> | 2011-06-08 08:26:01 -0700 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-06-08 08:26:01 -0700 |
commit | 3742ac093d35d923c81693096ab6671e9b147700 (patch) | |
tree | c2add9100f789dad45ef1ec5328bddde02c47a4c /Source/WebCore/dom/Document.h | |
parent | 901401d90459bc22580842455d4588b9a697514d (diff) | |
parent | e5926f4a0d6adc9ad4a75824129f117181953560 (diff) | |
download | external_webkit-3742ac093d35d923c81693096ab6671e9b147700.zip external_webkit-3742ac093d35d923c81693096ab6671e9b147700.tar.gz external_webkit-3742ac093d35d923c81693096ab6671e9b147700.tar.bz2 |
Merge changes I55c6d71a,Ifb3277d4,Ia1b847a2,I7ba9cf3f,Ida2b2a8a,I1280ec90,I72f818d5,I2e3b588b,I9a4e6289,Ia724c78b,Icd8612c8,Ie31b15d7,Ie125edae,I77941a88,I89dae78b,I3516e5ca,I1a4c17b5,I2c4ecc1a,I9c8e6537,Ifac13115,Ie1f80e09,Ia541ed77,I60ce9d78
* changes:
Merge WebKit at r82507: Update ThirdPartyProject.prop
Merge WebKit at r82507: Cherry-pick change r88166 to add INSPECTOR guards to ScriptProfiler
Merge WebKit at r82507: Work around a V8 bug
Merge WebKit at r82507: JNIType renamed to JavaType
Merge WebKit at r82507: IconDatabaseClient interface expanded
Merge WebKit at r82507: Don't use new loss-free code path in HTMLCanvasElement::toDataURL()
Merge WebKit at r82507: IcondDatabaseBase::iconForPageURL() renamed
Merge WebKit at r82507: IconDatabaseBase::Open() signature changed
Merge WebKit at r82507: Node::isContentEditable() renamed
Merge WebKit at r82507: Use icon database through IconDatabaseBase
Merge WebKit at r82507: toInputElement() is now a member of Node
Merge WebKit at r82507: FrameLoaderClient::objectContentType() signature changed
Merge WebKit at r82507: StringImpl::computeHash() removed
Merge WebKit at r82507: Stub out FontPlatformData::setOrientation()
Merge WebKit at r82507: Path::strokeBoundingRect() is now const
Merge WebKit at r82507: Add missing UnusedParam.h include in ApplicationCacheGroup.cpp
Merge WebKit at r82507: Continue to use Android's version of FontPlatformData.h
Merge WebKit at r82507: Update signature of FontCustomPlatformData::fontPlatformData()
Merge WebKit at r82507: Fix conflicts due to JNI refactoring
Merge WebKit at r82507: Fix conflicts due to new StorageTracker
Merge WebKit at r82507: Fix conflicts
Merge WebKit at r82507: Fix makefiles
Merge WebKit at r82507: Initial merge by git
Diffstat (limited to 'Source/WebCore/dom/Document.h')
-rw-r--r-- | Source/WebCore/dom/Document.h | 41 |
1 files changed, 17 insertions, 24 deletions
diff --git a/Source/WebCore/dom/Document.h b/Source/WebCore/dom/Document.h index ae9b24e..11c595a 100644 --- a/Source/WebCore/dom/Document.h +++ b/Source/WebCore/dom/Document.h @@ -32,7 +32,6 @@ #include "CollectionType.h" #include "Color.h" #include "ContainerNode.h" -#include "ContentSecurityPolicy.h" #include "DOMTimeStamp.h" #include "DocumentOrderedMap.h" #include "DocumentTiming.h" @@ -51,20 +50,20 @@ namespace WebCore { -class AsyncScriptRunner; -class Attr; class AXObjectCache; +class Attr; class CDATASection; +class CSSPrimitiveValueCache; +class CSSStyleDeclaration; +class CSSStyleSelector; +class CSSStyleSheet; class CachedCSSStyleSheet; class CachedResourceLoader; class CachedScript; class CanvasRenderingContext; class CharacterData; -class CSSPrimitiveValueCache; -class CSSStyleDeclaration; -class CSSStyleSelector; -class CSSStyleSheet; class Comment; +class ContentSecurityPolicy; class DOMImplementation; class DOMSelection; class DOMWindow; @@ -115,6 +114,7 @@ class RenderView; class RenderFullScreen; class ScriptableDocumentParser; class ScriptElementData; +class ScriptRunner; class SecurityOrigin; class SerializedScriptValue; class SegmentedString; @@ -820,7 +820,8 @@ public: HTMLFrameOwnerElement* ownerElement() const; String title() const { return m_title; } - void setTitle(const String&, Element* titleElement = 0); + void setTitle(const String&); + void setTitleElement(const String& title, Element* titleElement); void removeTitle(Element* titleElement); String cookie(ExceptionCode&) const; @@ -908,7 +909,7 @@ public: int docID() const { return m_docID; } - AsyncScriptRunner* asyncScriptRunner() { return m_asyncScriptRunner.get(); } + ScriptRunner* scriptRunner() { return m_scriptRunner.get(); } #if ENABLE(XSLT) void applyXSLTransform(ProcessingInstruction* pi); @@ -919,8 +920,8 @@ public: TransformSource* transformSource() const { return m_transformSource.get(); } #endif - void incDOMTreeVersion() { ++m_domTreeVersion; } - unsigned domTreeVersion() const { return m_domTreeVersion; } + void incDOMTreeVersion() { m_domTreeVersion = ++s_globalTreeVersion; } + uint64_t domTreeVersion() const { return m_domTreeVersion; } #ifdef ANDROID_STYLE_VERSION void incStyleVersion() { ++m_styleVersion; } @@ -1106,6 +1107,7 @@ public: void setFullScreenRendererBackgroundColor(Color); void fullScreenChangeDelayTimerFired(Timer<Document>*); + bool fullScreenIsAllowedForElement(Element*) const; #endif // Used to allow element that loads data without going through a FrameLoader to delay the 'load' event. @@ -1135,9 +1137,6 @@ public: ContentSecurityPolicy* contentSecurityPolicy() { return m_contentSecurityPolicy.get(); } - void suspendScheduledTasks(); - void resumeScheduledTasks(); - protected: Document(Frame*, const KURL&, bool isXHTML, bool isHTML); @@ -1173,7 +1172,7 @@ private: String encoding() const; - void updateTitle(); + void updateTitle(const String& title); void updateFocusAppearanceTimerFired(Timer<Document>*); void updateBaseURL(); @@ -1185,10 +1184,6 @@ private: void loadEventDelayTimerFired(Timer<Document>*); - void pendingTasksTimerFired(Timer<Document>*); - - static void didReceiveTask(void*); - OwnPtr<CSSStyleSelector> m_styleSelector; bool m_didCalculateStyleSelector; bool m_hasDirtyStyleSelector; @@ -1258,7 +1253,8 @@ private: RefPtr<Node> m_activeNode; mutable RefPtr<Element> m_documentElement; - unsigned m_domTreeVersion; + uint64_t m_domTreeVersion; + static uint64_t s_globalTreeVersion; #ifdef ANDROID_STYLE_VERSION unsigned m_styleVersion; #endif @@ -1341,7 +1337,7 @@ private: // points during the lifetime of the Document. int m_extraLayoutDelay; - OwnPtr<AsyncScriptRunner> m_asyncScriptRunner; + OwnPtr<ScriptRunner> m_scriptRunner; #if ENABLE(XSLT) OwnPtr<TransformSource> m_transformSource; @@ -1460,9 +1456,6 @@ private: #endif RefPtr<ContentSecurityPolicy> m_contentSecurityPolicy; - - Timer<Document> m_pendingTasksTimer; - Vector<OwnPtr<Task> > m_pendingTasks; }; inline bool Document::hasElementWithId(AtomicStringImpl* id) const |