Changeset 60989 in webkit
- Timestamp:
- Jun 10, 2010 10:28:50 PM (14 years ago)
- Location:
- trunk/WebCore
- Files:
-
- 7 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/WebCore/ChangeLog
r60984 r60989 1 2010-06-10 Tony Gentilcore <tonyg@chromium.org> 2 3 Reviewed by Eric Seidel. 4 5 Fix fast/forms/preserveFormDuringResidualStyle.html for HTML5 Parser. 6 https://bugs.webkit.org/show_bug.cgi?id=40454 7 8 This required exposing the HTMLParser which we definitely don't want to 9 do, but the good news is that it can go away when the HTMLParser goes 10 away. 11 12 No new tests because covered by fast/forms/preserve/FormDuringResidualStyle.html. 13 14 * dom/Tokenizer.h: 15 (WebCore::Tokenizer::htmlParser): 16 * html/HTML5Tokenizer.cpp: 17 (WebCore::HTML5Tokenizer::htmlParser): 18 * html/HTML5Tokenizer.h: 19 * html/HTML5TreeBuilder.h: 20 (WebCore::HTML5TreeBuilder::htmlParser): 21 * html/HTMLFormControlElement.cpp: 22 (WebCore::HTMLFormControlElement::removedFromTree): 23 * html/HTMLTokenizer.h: 24 (WebCore::HTMLTokenizer::htmlParser): 25 1 26 2010-06-10 Tony Chang <tony@chromium.org> 2 27 -
trunk/WebCore/dom/Tokenizer.h
r59749 r60989 26 26 namespace WebCore { 27 27 28 class HTMLParser; 28 29 class HTMLTokenizer; 29 30 class SegmentedString; … … 61 62 virtual void executeScriptsWaitingForStylesheets() {} 62 63 63 virtual bool isHTMLTokenizer() const { return false; }64 virtual HTMLParser* htmlParser() const { return 0; } 64 65 virtual HTMLTokenizer* asHTMLTokenizer() { return 0; } 65 66 -
trunk/WebCore/html/HTML5Tokenizer.cpp
r60964 r60989 193 193 } 194 194 195 HTMLParser* HTML5Tokenizer::htmlParser() const 196 { 197 return m_treeBuilder->htmlParser(); 198 } 199 195 200 bool HTML5Tokenizer::isWaitingForScripts() const 196 201 { -
trunk/WebCore/html/HTML5Tokenizer.h
r60943 r60989 37 37 38 38 class HTMLDocument; 39 class HTMLParser; 39 40 class HTML5Lexer; 40 41 class HTML5ScriptRunner; … … 61 62 virtual int lineNumber() const; 62 63 virtual int columnNumber() const; 64 // FIXME: HTMLFormControlElement accesses the HTMLParser via this method. 65 // Remove this when the HTMLParser is no longer used. 66 virtual HTMLParser* htmlParser() const; 63 67 64 68 // HTML5ScriptRunnerHost -
trunk/WebCore/html/HTML5TreeBuilder.h
r60897 r60989 59 59 void finished(); 60 60 61 // FIXME: This is a dirty, rotten hack to keep HTMLFormControlElement happy 62 // until we stop using the legacy parser. DO NOT CALL THIS METHOD. 63 HTMLParser* htmlParser() const { return m_legacyHTMLParser.get(); } 64 61 65 private: 62 66 // Represents HTML5 "insertion mode" -
trunk/WebCore/html/HTMLFormControlElement.cpp
r60232 r60989 179 179 // If the form and element are both in the same tree, preserve the connection to the form. 180 180 // Otherwise, null out our form and remove ourselves from the form's list of elements. 181 HTMLParser* parser = 0; 182 if (Tokenizer* tokenizer = document()->tokenizer()) 183 if (tokenizer->isHTMLTokenizer()) 184 parser = static_cast<HTMLTokenizer*>(tokenizer)->htmlParser(); 185 181 HTMLParser* parser = document()->tokenizer()->htmlParser(); 186 182 if (m_form && !(parser && parser->isHandlingResidualStyleAcrossBlocks()) && findRoot(this) != findRoot(m_form)) { 187 183 m_form->removeFormElement(this); -
trunk/WebCore/html/HTMLTokenizer.h
r60826 r60989 164 164 virtual void executeScriptsWaitingForStylesheets(); 165 165 166 virtual bool isHTMLTokenizer() const { return true; }166 virtual HTMLParser* htmlParser() const { return m_parser.get(); } 167 167 virtual HTMLTokenizer* asHTMLTokenizer() { return this; } 168 HTMLParser* htmlParser() const { return m_parser.get(); }169 168 170 169 private:
Note: See TracChangeset
for help on using the changeset viewer.