Changeset 30455 in webkit

Timestamp:

Feb 20, 2008, 11:38:13 PM (17 years ago)

Author:

mitz@apple.com

Message:

WebCore:

Reviewed by Dave Hyatt.

• fix ​http://bugs.webkit.org/show_bug.cgi?id=17465 REGRESSION: <DIV> tokenized into Div if still searching for DOCTYPE

Test: fast/tokenizer/doctype-search-reset.html

• html/HTMLTokenizer.cpp: (WebCore::HTMLTokenizer::parseTag):

LayoutTests:

Reviewed by Dave Hyatt.

• test for ​http://bugs.webkit.org/show_bug.cgi?id=17465 REGRESSION: <DIV> tokenized into Div if still searching for DOCTYPE

• fast/tokenizer/doctype-search-reset-expected.txt: Added.
• fast/tokenizer/doctype-search-reset.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/tokenizer/doctype-search-reset-expected.txt (added)
• LayoutTests/fast/tokenizer/doctype-search-reset.html (added)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/html/HTMLTokenizer.cpp (modified) (2 diffs)

trunk/LayoutTests/ChangeLog ¶

@@ +1 @@
+2008-02-20  Dan Bernstein  <mitz@apple.com>
+
+        Reviewed by Dave Hyatt.
+
+        - test for http://bugs.webkit.org/show_bug.cgi?id=17465
+          REGRESSION: <DIV> tokenized into Div if still searching for DOCTYPE
+
+        * fast/tokenizer/doctype-search-reset-expected.txt: Added.
+        * fast/tokenizer/doctype-search-reset.html: Added.
+
 2008-02-20  Dan Bernstein  <mitz@apple.com>
 

trunk/WebCore/ChangeLog ¶

@@ +1 @@
+2008-02-20  Dan Bernstein  <mitz@apple.com>
+
+        Reviewed by Dave Hyatt.
+
+        - fix http://bugs.webkit.org/show_bug.cgi?id=17465
+          REGRESSION: <DIV> tokenized into Div if still searching for DOCTYPE
+
+        Test: fast/tokenizer/doctype-search-reset.html
+
+        * html/HTMLTokenizer.cpp:
+        (WebCore::HTMLTokenizer::parseTag):
+
 2008-02-20  Dan Bernstein  <mitz@apple.com>
 

trunk/WebCore/html/HTMLTokenizer.cpp ¶

@@ -1090 +1090 @@
                     if (searchCount == 2)
                         m_doctypeSearchCount++; // A '!' is also part of a doctype, so we are moving through that still as well.
+                    else
+                        m_doctypeSearchCount = 0;
                     if (searchCount == 4) {
                         // Found '<!--' sequence
@@ -1135 +1137 @@
                     }
                     break;
-                }
-                else
+                } else
                     m_doctypeSearchCount = 0; // Stop looking for '<!DOCTYPE' sequence
             }