Changeset 64023 in webkit

Timestamp:

Jul 25, 2010 2:36:32 PM (14 years ago)

Author:

abarth@webkit.org

Message:

2010-07-25 Adam Barth <​abarth@webkit.org>

Reviewed by Eric Seidel.

Functions supporting the legacy tree builder are confusing
​https://bugs.webkit.org/show_bug.cgi?id=42951

This patch just inlines these functions into their one call site and
removes the notImplemented() calls. We thought we were going to grow
these to support the new tree builder, but we took a different path.
Previous to this patch, these functions were confusing because they
looked like part of the new tree builder.

• html/HTMLTreeBuilder.cpp: (WebCore::HTMLTreeBuilder::passTokenToLegacyParser):
• html/HTMLTreeBuilder.h:

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• html/HTMLTreeBuilder.cpp (modified) (3 diffs)
• html/HTMLTreeBuilder.h (modified) (1 diff)

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-07-25  Adam Barth  <abarth@webkit.org>
+
+        Reviewed by Eric Seidel.
+
+        Functions supporting the legacy tree builder are confusing
+        https://bugs.webkit.org/show_bug.cgi?id=42951
+
+        This patch just inlines these functions into their one call site and
+        removes the notImplemented() calls.  We thought we were going to grow
+        these to support the new tree builder, but we took a different path.
+        Previous to this patch, these functions were confusing because they
+        looked like part of the new tree builder.
+
+        * html/HTMLTreeBuilder.cpp:
+        (WebCore::HTMLTreeBuilder::passTokenToLegacyParser):
+        * html/HTMLTreeBuilder.h:
+
 2010-07-25  Adam Barth  <abarth@webkit.org>
 

trunk/WebCore/html/HTMLTreeBuilder.cpp

@@ -393 +393 @@
 }
 
-void HTMLTreeBuilder::handleScriptStartTag()
-{
-    notImplemented(); // The HTML frgment case?
-    m_tokenizer->setState(HTMLTokenizer::ScriptDataState);
-    notImplemented(); // Save insertion mode.
-}
-
-void HTMLTreeBuilder::handleScriptEndTag(Element* scriptElement, int scriptStartLine)
-{
-    ASSERT(!m_scriptToProcess); // Caller never called takeScriptToProcess!
-    ASSERT(m_scriptToProcessStartLine == uninitializedLineNumberValue); // Caller never called takeScriptToProcess!
-    notImplemented(); // Save insertion mode and insertion point?
-
-    // Pause ourselves so that parsing stops until the script can be processed by the caller.
-    m_isPaused = true;
-    m_scriptToProcess = scriptElement;
-    // Lexer line numbers are 0-based, ScriptSourceCode expects 1-based lines,
-    // so we convert here before passing the line number off to HTMLScriptRunner.
-    m_scriptToProcessStartLine = scriptStartLine + 1;
-}
-
 PassRefPtr<Element> HTMLTreeBuilder::takeScriptToProcess(int& scriptStartLine)
 {
@@ -471 +450 @@
         // when using the old parser for we have to do this manually.
         if (oldStyleToken.tagName == scriptTag) {
-            handleScriptStartTag();
+            m_tokenizer->setState(HTMLTokenizer::ScriptDataState);
             m_lastScriptElement = static_pointer_cast<Element>(result);
             m_lastScriptElementStartLine = m_tokenizer->lineNumber();
@@ -488 +467 @@
                     // does not show up in pasted HTML.
                     m_lastScriptElement->removeChildren();
-                } else if (insertionMode() != AfterFramesetMode)
-                    handleScriptEndTag(m_lastScriptElement.get(), m_lastScriptElementStartLine);
+                } else if (insertionMode() != AfterFramesetMode) {
+                    ASSERT(!m_scriptToProcess); // Caller never called takeScriptToProcess!
+                    ASSERT(m_scriptToProcessStartLine == uninitializedLineNumberValue); // Caller never called takeScriptToProcess!
+                    // Pause ourselves so that parsing stops until the script can be processed by the caller.
+                    m_isPaused = true;
+                    m_scriptToProcess = m_lastScriptElement.get();
+                    // Lexer line numbers are 0-based, ScriptSourceCode expects 1-based lines,
+                    // so we convert here before passing the line number off to HTMLScriptRunner.
+                    m_scriptToProcessStartLine = m_lastScriptElementStartLine + 1;
+                }
                 m_lastScriptElement = 0;
                 m_lastScriptElementStartLine = uninitializedLineNumberValue;

trunk/WebCore/html/HTMLTreeBuilder.h

@@ -174 +174 @@
     void parseError(AtomicHTMLToken&) { }
 
-    void handleScriptStartTag();
-    void handleScriptEndTag(Element*, int scriptStartLine);
-
     InsertionMode insertionMode() const { return m_insertionMode; }
     void setInsertionMode(InsertionMode mode)