Changeset 139042 in webkit

Timestamp:

Jan 8, 2013, 12:23:01 AM (13 years ago)

Author:

abarth@webkit.org

Message:

HTMLTreeBuilder shouldn't keep a Document pointer
​https://bugs.webkit.org/show_bug.cgi?id=106268

Reviewed by Eric Seidel.

The tree builder shouldn't interact with the Document directly.
Instead, the tree builder should use the HTMLConstructionSite to
interact with the document.

Unfortunately, the HTMLTreeBuilder does need to read back one bit of
information (the quirks mode) from the Document. Currently the
HTMLConstructionSite reads the information directly from the Document.
If/when we move the parser onto its own thread, we'll need to keep
track of this bit on the parser thread. (We should be able to
encapsulate all that logic in the HTMLConstructionSite.)

• html/parser/HTMLConstructionSite.cpp:

(WebCore::HTMLConstructionSite::setDefaultCompatibilityMode):
(WebCore):
(WebCore::HTMLConstructionSite::finishedParsing):
(WebCore::HTMLConstructionSite::inQuirksMode):

• html/parser/HTMLConstructionSite.h:

(HTMLConstructionSite):

• html/parser/HTMLTreeBuilder.cpp:

(WebCore::HTMLTreeBuilder::HTMLTreeBuilder):
(WebCore::HTMLTreeBuilder::detach):
(WebCore::HTMLTreeBuilder::processStartTagForInBody):
(WebCore::HTMLTreeBuilder::defaultForInitial):
(WebCore::HTMLTreeBuilder::finished):

• html/parser/HTMLTreeBuilder.h:

(HTMLTreeBuilder):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• html/parser/HTMLConstructionSite.cpp (modified) (2 diffs)
• html/parser/HTMLConstructionSite.h (modified) (2 diffs)
• html/parser/HTMLTreeBuilder.cpp (modified) (7 diffs)
• html/parser/HTMLTreeBuilder.h (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-01-08  Adam Barth  <abarth@webkit.org>
+
+        HTMLTreeBuilder shouldn't keep a Document pointer
+        https://bugs.webkit.org/show_bug.cgi?id=106268
+
+        Reviewed by Eric Seidel.
+
+        The tree builder shouldn't interact with the Document directly.
+        Instead, the tree builder should use the HTMLConstructionSite to
+        interact with the document.
+
+        Unfortunately, the HTMLTreeBuilder does need to read back one bit of
+        information (the quirks mode) from the Document. Currently the
+        HTMLConstructionSite reads the information directly from the Document.
+        If/when we move the parser onto its own thread, we'll need to keep
+        track of this bit on the parser thread. (We should be able to
+        encapsulate all that logic in the HTMLConstructionSite.)
+
+        * html/parser/HTMLConstructionSite.cpp:
+        (WebCore::HTMLConstructionSite::setDefaultCompatibilityMode):
+        (WebCore):
+        (WebCore::HTMLConstructionSite::finishedParsing):
+        (WebCore::HTMLConstructionSite::inQuirksMode):
+        * html/parser/HTMLConstructionSite.h:
+        (HTMLConstructionSite):
+        * html/parser/HTMLTreeBuilder.cpp:
+        (WebCore::HTMLTreeBuilder::HTMLTreeBuilder):
+        (WebCore::HTMLTreeBuilder::detach):
+        (WebCore::HTMLTreeBuilder::processStartTagForInBody):
+        (WebCore::HTMLTreeBuilder::defaultForInitial):
+        (WebCore::HTMLTreeBuilder::finished):
+        * html/parser/HTMLTreeBuilder.h:
+        (HTMLTreeBuilder):
+
 2013-01-08  Yuki Sekiguchi  <yuki.sekiguchi@access-company.com>
 

trunk/Source/WebCore/html/parser/HTMLConstructionSite.cpp

@@ -226 +226 @@
 }
 
+void HTMLConstructionSite::setDefaultCompatibilityMode()
+{
+    if (m_isParsingFragment)
+        return;
+    if (m_document->isSrcdocDocument())
+        return;
+    m_document->setCompatibilityMode(Document::QuirksMode);
+}
+
+void HTMLConstructionSite::finishedParsing()
+{
+    m_document->finishedParsing();
+}
+
 void HTMLConstructionSite::insertDoctype(AtomicHTMLToken* token)
 {
@@ -481 +495 @@
 }
 
+bool HTMLConstructionSite::inQuirksMode()
+{
+    // When we move the parser onto a background thread, we'll need to keep track of this bit on the parser thread.
+    return m_document->inQuirksMode();
+}
+
 void HTMLConstructionSite::findFosterSite(HTMLConstructionSiteTask& task)
 {

trunk/Source/WebCore/html/parser/HTMLConstructionSite.h

@@ -80 +80 @@
     void executeQueuedTasks();
 
+    void setDefaultCompatibilityMode();
+    void finishedParsing();
+
     void insertDoctype(AtomicHTMLToken*);
     void insertComment(AtomicHTMLToken*);
@@ -108 +111 @@
     void generateImpliedEndTags();
     void generateImpliedEndTagsWithExclusion(const AtomicString& tagName);
+
+    bool inQuirksMode();
 
     bool isEmpty() const { return !m_openElements.stackDepth(); }

trunk/Source/WebCore/html/parser/HTMLTreeBuilder.cpp

@@ -29 +29 @@
 
 #include "Comment.h"
-#include "DOMWindow.h"
 #include "DocumentFragment.h"
 #include "DocumentType.h"
@@ -272 +271 @@
 HTMLTreeBuilder::HTMLTreeBuilder(HTMLDocumentParser* parser, HTMLDocument* document, bool, const HTMLParserOptions& options)
     : m_framesetOk(true)
-    , m_document(document)
+#ifndef NDEBUG
+    , m_isAttached(true)
+#endif
     , m_tree(document, options.maximumDOMTreeDepth)
     , m_insertionMode(InitialMode)
@@ -287 +288 @@
 HTMLTreeBuilder::HTMLTreeBuilder(HTMLDocumentParser* parser, DocumentFragment* fragment, Element* contextElement, FragmentScriptingPermission scriptingPermission, const HTMLParserOptions& options)
     : m_framesetOk(true)
+#ifndef NDEBUG
+    , m_isAttached(true)
+#endif
     , m_fragmentContext(fragment, contextElement, scriptingPermission)
-    , m_document(fragment->document())
     , m_tree(fragment, scriptingPermission, options.maximumDOMTreeDepth)
     , m_insertionMode(InitialMode)
@@ -323 +326 @@
 void HTMLTreeBuilder::detach()
 {
+#ifndef NDEBUG
     // This call makes little sense in fragment mode, but for consistency
     // DocumentParser expects detach() to always be called before it's destroyed.
-    m_document = 0;
+    m_isAttached = false;
+#endif
     // HTMLConstructionSite might be on the callstack when detach() is called
     // otherwise we'd just call m_tree.clear() here instead.
@@ -825 +830 @@
     }
     if (token->name() == tableTag) {
-        if (!m_document->inQuirksMode() && m_tree.openElements()->inButtonScope(pTag))
+        if (!m_tree.inQuirksMode() && m_tree.openElements()->inButtonScope(pTag))
             processFakeEndTag(pTag);
         m_tree.insertHTMLElement(token);
@@ -2613 +2618 @@
 {
     notImplemented();
-    if (!m_fragmentContext.fragment() && !m_document->isSrcdocDocument())
-        m_document->setCompatibilityMode(Document::QuirksMode);
+    m_tree.setDefaultCompatibilityMode();
     // FIXME: parse error
     setInsertionMode(BeforeHTMLMode);
@@ -2904 +2908 @@
 #endif
 
-    ASSERT(m_document);
+    ASSERT(m_isAttached);
     // Warning, this may detach the parser. Do not do anything else after this.
-    m_document->finishedParsing();
+    m_tree.finishedParsing();
 }
 

trunk/Source/WebCore/html/parser/HTMLTreeBuilder.h

@@ -188 +188 @@
     void processCloseWhenNestedTag(AtomicHTMLToken*);
 
-    bool m_framesetOk;
-
     void parseError(AtomicHTMLToken*);
 
@@ -221 +219 @@
     };
 
+    bool m_framesetOk;
+#ifndef NDEBUG
+    bool m_isAttached;
+#endif
     FragmentParsingContext m_fragmentContext;
-
-    Document* m_document;
     HTMLConstructionSite m_tree;