Changeset 61028 in webkit

Timestamp:

Jun 11, 2010 11:46:27 AM (14 years ago)

Author:

eric@webkit.org

Message:

2010-06-11 Tony Gentilcore <​tonyg@chromium.org>

Reviewed by Eric Seidel.

Fix fast/forms/preserveFormDuringResidualStyle.html for HTML5 Parser.
​https://bugs.webkit.org/show_bug.cgi?id=40454

This required exposing the HTMLParser which we definitely don't want to
do, but the good news is that it can go away when the HTMLParser goes
away.

No new tests because covered by fast/forms/preserve/FormDuringResidualStyle.html.

• dom/Tokenizer.h: (WebCore::Tokenizer::htmlParser):
• html/HTML5Tokenizer.cpp: (WebCore::HTML5Tokenizer::htmlParser):
• html/HTML5Tokenizer.h:
• html/HTML5TreeBuilder.h: (WebCore::HTML5TreeBuilder::htmlParser):
• html/HTMLFormControlElement.cpp: (WebCore::HTMLFormControlElement::removedFromTree):
• html/HTMLTokenizer.h: (WebCore::HTMLTokenizer::htmlParser):

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• dom/Tokenizer.h (modified) (2 diffs)
• html/HTML5Tokenizer.cpp (modified) (1 diff)
• html/HTML5Tokenizer.h (modified) (2 diffs)
• html/HTML5TreeBuilder.h (modified) (1 diff)
• html/HTMLFormControlElement.cpp (modified) (1 diff)
• html/HTMLTokenizer.h (modified) (1 diff)

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-06-11  Tony Gentilcore  <tonyg@chromium.org>
+
+        Reviewed by Eric Seidel.
+
+        Fix fast/forms/preserveFormDuringResidualStyle.html for HTML5 Parser.
+        https://bugs.webkit.org/show_bug.cgi?id=40454
+
+        This required exposing the HTMLParser which we definitely don't want to
+        do, but the good news is that it can go away when the HTMLParser goes
+        away.
+
+        No new tests because covered by fast/forms/preserve/FormDuringResidualStyle.html.
+
+        * dom/Tokenizer.h:
+        (WebCore::Tokenizer::htmlParser):
+        * html/HTML5Tokenizer.cpp:
+        (WebCore::HTML5Tokenizer::htmlParser):
+        * html/HTML5Tokenizer.h:
+        * html/HTML5TreeBuilder.h:
+        (WebCore::HTML5TreeBuilder::htmlParser):
+        * html/HTMLFormControlElement.cpp:
+        (WebCore::HTMLFormControlElement::removedFromTree):
+        * html/HTMLTokenizer.h:
+        (WebCore::HTMLTokenizer::htmlParser):
+
 2010-06-11  Kenneth Russell  <kbr@google.com>
 

trunk/WebCore/dom/Tokenizer.h

@@ -26 +26 @@
 namespace WebCore {
 
+    class HTMLParser;
     class HTMLTokenizer;
     class SegmentedString;
@@ -61 +62 @@
         virtual void executeScriptsWaitingForStylesheets() {}
 
-        virtual bool isHTMLTokenizer() const { return false; }
+        virtual HTMLParser* htmlParser() const { return 0; }
         virtual HTMLTokenizer* asHTMLTokenizer() { return 0; }
         

trunk/WebCore/html/HTML5Tokenizer.cpp

@@ -193 +193 @@
 }
 
+HTMLParser* HTML5Tokenizer::htmlParser() const
+{
+    return m_treeBuilder->htmlParser();
+}
+
 bool HTML5Tokenizer::isWaitingForScripts() const
 {

trunk/WebCore/html/HTML5Tokenizer.h

@@ -37 +37 @@
 
 class HTMLDocument;
+class HTMLParser;
 class HTML5Lexer;
 class HTML5ScriptRunner;
@@ -61 +62 @@
     virtual int lineNumber() const;
     virtual int columnNumber() const;
+    // FIXME: HTMLFormControlElement accesses the HTMLParser via this method.
+    // Remove this when the HTMLParser is no longer used.
+    virtual HTMLParser* htmlParser() const;
 
     // HTML5ScriptRunnerHost

trunk/WebCore/html/HTML5TreeBuilder.h

@@ -59 +59 @@
     void finished();
 
+    // FIXME: This is a dirty, rotten hack to keep HTMLFormControlElement happy
+    // until we stop using the legacy parser. DO NOT CALL THIS METHOD.
+    HTMLParser* htmlParser() const { return m_legacyHTMLParser.get(); }
+
 private:
     // Represents HTML5 "insertion mode"

trunk/WebCore/html/HTMLFormControlElement.cpp

@@ -181 +181 @@
     HTMLParser* parser = 0;
     if (Tokenizer* tokenizer = document()->tokenizer())
-        if (tokenizer->isHTMLTokenizer())
-            parser = static_cast<HTMLTokenizer*>(tokenizer)->htmlParser();
-    
+        parser = tokenizer->htmlParser();
+
     if (m_form && !(parser && parser->isHandlingResidualStyleAcrossBlocks()) && findRoot(this) != findRoot(m_form)) {
         m_form->removeFormElement(this);

trunk/WebCore/html/HTMLTokenizer.h

@@ -164 +164 @@
     virtual void executeScriptsWaitingForStylesheets();
     
-    virtual bool isHTMLTokenizer() const { return true; }
+    virtual HTMLParser* htmlParser() const { return m_parser.get(); }
     virtual HTMLTokenizer* asHTMLTokenizer() { return this; }
-    HTMLParser* htmlParser() const { return m_parser.get(); }
 
 private: