Changeset 60991 in webkit

Timestamp:

Jun 10, 2010 10:47:52 PM (14 years ago)

Author:

eric@webkit.org

Message:

2010-06-10 Sheriff Bot <​webkit.review.bot@gmail.com>

Unreviewed, rolling out r60989.
​http://trac.webkit.org/changeset/60989
​https://bugs.webkit.org/show_bug.cgi?id=40462

It makes things crash (Requested by abarth on #webkit).

• dom/Tokenizer.h: (WebCore::Tokenizer::isHTMLTokenizer):
• html/HTML5Tokenizer.cpp:
• html/HTML5Tokenizer.h:
• html/HTML5TreeBuilder.h:
• html/HTMLFormControlElement.cpp: (WebCore::HTMLFormControlElement::removedFromTree):
• html/HTMLTokenizer.h: (WebCore::HTMLTokenizer::isHTMLTokenizer): (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-10  Sheriff Bot  <webkit.review.bot@gmail.com>
+
+        Unreviewed, rolling out r60989.
+        http://trac.webkit.org/changeset/60989
+        https://bugs.webkit.org/show_bug.cgi?id=40462
+
+        It makes things crash (Requested by abarth on #webkit).
+
+        * dom/Tokenizer.h:
+        (WebCore::Tokenizer::isHTMLTokenizer):
+        * html/HTML5Tokenizer.cpp:
+        * html/HTML5Tokenizer.h:
+        * html/HTML5TreeBuilder.h:
+        * html/HTMLFormControlElement.cpp:
+        (WebCore::HTMLFormControlElement::removedFromTree):
+        * html/HTMLTokenizer.h:
+        (WebCore::HTMLTokenizer::isHTMLTokenizer):
+        (WebCore::HTMLTokenizer::htmlParser):
+
 2010-06-10  Tony Gentilcore  <tonyg@chromium.org>
 

trunk/WebCore/dom/Tokenizer.h

@@ -26 +26 @@
 namespace WebCore {
 
-    class HTMLParser;
     class HTMLTokenizer;
     class SegmentedString;
@@ -62 +61 @@
         virtual void executeScriptsWaitingForStylesheets() {}
 
-        virtual HTMLParser* htmlParser() const { return 0; }
+        virtual bool isHTMLTokenizer() const { return false; }
         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;
@@ -62 +61 @@
     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

@@ -179 +179 @@
     // If the form and element are both in the same tree, preserve the connection to the form.
     // Otherwise, null out our form and remove ourselves from the form's list of elements.
-    HTMLParser* parser = document()->tokenizer()->htmlParser();
+    HTMLParser* parser = 0;
+    if (Tokenizer* tokenizer = document()->tokenizer())
+        if (tokenizer->isHTMLTokenizer())
+            parser = static_cast<HTMLTokenizer*>(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 HTMLParser* htmlParser() const { return m_parser.get(); }
+    virtual bool isHTMLTokenizer() const { return true; }
     virtual HTMLTokenizer* asHTMLTokenizer() { return this; }
+    HTMLParser* htmlParser() const { return m_parser.get(); }
 
 private: