LayoutTests:
authordarin <darin@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sun, 19 Mar 2006 18:40:37 +0000 (18:40 +0000)
committerdarin <darin@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sun, 19 Mar 2006 18:40:37 +0000 (18:40 +0000)
        - changed these tests to be expected failures because I had to roll
          out the fix to http://bugzilla.opendarwin.org/show_bug.cgi?id=6314
          Unclosed <style> element in <head> makes page completely blank

        * fast/js/exception-linenums-in-html-3-expected.txt:
        * fast/js/exception-linenums-in-html-3-expected.png: Added.
        * fast/js/exception-linenums-in-html-3-expected.checksum: Added.

        * fast/js/missing-style-end-tag-js-expected.txt:
        * fast/js/missing-style-end-tag-js-expected.png: Added.
        * fast/js/missing-style-end-tag-js-expected.checksum: Added.

        * fast/tokenizer/missing-style-end-tag-1-expected.checksum:
        * fast/tokenizer/missing-style-end-tag-1-expected.png:
        * fast/tokenizer/missing-style-end-tag-1-expected.txt:
        * fast/tokenizer/missing-style-end-tag-2-expected.checksum:
        * fast/tokenizer/missing-style-end-tag-2-expected.png:
        * fast/tokenizer/missing-style-end-tag-2-expected.txt:

        - added some missing pixel-test results

        * tables/mozilla/marvin/backgr_layers-opacity-expected.checksum: Added.
        * tables/mozilla/marvin/backgr_layers-opacity-expected.png: Added.
        * fast/dom/Element/class-attribute-whitespace-expected.png: Added.
        * fast/canvas/patternfill-repeat-expected.png: Added.

WebCore:

        - roll out fix for http://bugzilla.opendarwin.org/show_bug.cgi?id=6314
          Unclosed <style> element in <head> makes page completely blank

        This fix was breaking major sites -- details in the bug report.

        * khtml/html/htmltokenizer.cpp: (WebCore::HTMLTokenizer::parseTag):
        Removed the bug fix, added a FIXME about the <title> code that has
        the same problem.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@13390 268f45cc-cd09-0410-ab3c-d52691b4dbfc

19 files changed:
LayoutTests/ChangeLog
LayoutTests/fast/canvas/patternfill-repeat-expected.png [new file with mode: 0644]
LayoutTests/fast/dom/Element/class-attribute-whitespace-expected.png [new file with mode: 0644]
LayoutTests/fast/js/exception-linenums-in-html-3-expected.checksum [new file with mode: 0644]
LayoutTests/fast/js/exception-linenums-in-html-3-expected.png [new file with mode: 0644]
LayoutTests/fast/js/exception-linenums-in-html-3-expected.txt
LayoutTests/fast/js/missing-style-end-tag-js-expected.checksum [new file with mode: 0644]
LayoutTests/fast/js/missing-style-end-tag-js-expected.png [new file with mode: 0644]
LayoutTests/fast/js/missing-style-end-tag-js-expected.txt
LayoutTests/fast/tokenizer/missing-style-end-tag-1-expected.checksum
LayoutTests/fast/tokenizer/missing-style-end-tag-1-expected.png
LayoutTests/fast/tokenizer/missing-style-end-tag-1-expected.txt
LayoutTests/fast/tokenizer/missing-style-end-tag-2-expected.checksum
LayoutTests/fast/tokenizer/missing-style-end-tag-2-expected.png
LayoutTests/fast/tokenizer/missing-style-end-tag-2-expected.txt
LayoutTests/tables/mozilla/marvin/backgr_layers-opacity-expected.checksum [new file with mode: 0644]
LayoutTests/tables/mozilla/marvin/backgr_layers-opacity-expected.png [new file with mode: 0644]
WebCore/ChangeLog
WebCore/khtml/html/htmltokenizer.cpp

index 9587a54249fd3e7a48db96cb740eb32cce0a625c..d98e5ee421f9621a80582046d615c67e910d61fa 100644 (file)
@@ -1,3 +1,31 @@
+2006-03-19  Darin Adler  <darin@apple.com>
+
+        - changed these tests to be expected failures because I had to roll
+          out the fix to http://bugzilla.opendarwin.org/show_bug.cgi?id=6314
+          Unclosed <style> element in <head> makes page completely blank
+
+        * fast/js/exception-linenums-in-html-3-expected.txt:
+        * fast/js/exception-linenums-in-html-3-expected.png: Added.
+        * fast/js/exception-linenums-in-html-3-expected.checksum: Added.
+
+        * fast/js/missing-style-end-tag-js-expected.txt:
+        * fast/js/missing-style-end-tag-js-expected.png: Added.
+        * fast/js/missing-style-end-tag-js-expected.checksum: Added.
+
+        * fast/tokenizer/missing-style-end-tag-1-expected.checksum:
+        * fast/tokenizer/missing-style-end-tag-1-expected.png:
+        * fast/tokenizer/missing-style-end-tag-1-expected.txt:
+        * fast/tokenizer/missing-style-end-tag-2-expected.checksum:
+        * fast/tokenizer/missing-style-end-tag-2-expected.png:
+        * fast/tokenizer/missing-style-end-tag-2-expected.txt:
+
+        - added some missing pixel-test results
+
+        * tables/mozilla/marvin/backgr_layers-opacity-expected.checksum: Added.
+        * tables/mozilla/marvin/backgr_layers-opacity-expected.png: Added.
+        * fast/dom/Element/class-attribute-whitespace-expected.png: Added.
+        * fast/canvas/patternfill-repeat-expected.png: Added.
+
 2006-03-18  David Carson  <dacarson@gmail.com>        
 
         Reviewed by Darin.
diff --git a/LayoutTests/fast/canvas/patternfill-repeat-expected.png b/LayoutTests/fast/canvas/patternfill-repeat-expected.png
new file mode 100644 (file)
index 0000000..3dfe391
Binary files /dev/null and b/LayoutTests/fast/canvas/patternfill-repeat-expected.png differ
diff --git a/LayoutTests/fast/dom/Element/class-attribute-whitespace-expected.png b/LayoutTests/fast/dom/Element/class-attribute-whitespace-expected.png
new file mode 100644 (file)
index 0000000..458bac0
Binary files /dev/null and b/LayoutTests/fast/dom/Element/class-attribute-whitespace-expected.png differ
diff --git a/LayoutTests/fast/js/exception-linenums-in-html-3-expected.checksum b/LayoutTests/fast/js/exception-linenums-in-html-3-expected.checksum
new file mode 100644 (file)
index 0000000..d69a371
--- /dev/null
@@ -0,0 +1 @@
+853de00567d121bea0b7bece66a5d61c
\ No newline at end of file
diff --git a/LayoutTests/fast/js/exception-linenums-in-html-3-expected.png b/LayoutTests/fast/js/exception-linenums-in-html-3-expected.png
new file mode 100644 (file)
index 0000000..113fea4
Binary files /dev/null and b/LayoutTests/fast/js/exception-linenums-in-html-3-expected.png differ
index ba7fad174759399b1f3fe550b60659d05e501385..e670c0c8a88e544cc189c429a34a5c625cd51359 100644 (file)
@@ -1,19 +1,5 @@
-This test exercises the source URL and line number that is embedded in JavaScript exceptions, which is displayed in places like the JavaScript console. It differs from exception-linenums-in-html-1.html in that it only works if Bugzilla Bug 6314 has been fixed.
-
-On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
-
-
-PASS typeof e.sourceURL is "string"
-PASS e.line is 23
-PASS typeof e.sourceURL is "string"
-PASS e.line is 33
-PASS typeof e.sourceURL is "string"
-PASS e.line is 43
-PASS typeof e.sourceURL is "string"
-PASS e.line is 53
-PASS typeof e.sourceURL is "string"
-PASS e.line is 16
-PASS successfullyParsed is true
-
-TEST COMPLETE
-
+layer at (0,0) size 800x600
+  RenderCanvas at (0,0) size 800x600
+layer at (0,0) size 800x600
+  RenderBlock {HTML} at (0,0) size 800x600
+    RenderBody {BODY} at (8,8) size 784x584
diff --git a/LayoutTests/fast/js/missing-style-end-tag-js-expected.checksum b/LayoutTests/fast/js/missing-style-end-tag-js-expected.checksum
new file mode 100644 (file)
index 0000000..d69a371
--- /dev/null
@@ -0,0 +1 @@
+853de00567d121bea0b7bece66a5d61c
\ No newline at end of file
diff --git a/LayoutTests/fast/js/missing-style-end-tag-js-expected.png b/LayoutTests/fast/js/missing-style-end-tag-js-expected.png
new file mode 100644 (file)
index 0000000..113fea4
Binary files /dev/null and b/LayoutTests/fast/js/missing-style-end-tag-js-expected.png differ
index bf594c6593cccbf853a2f5e10a3f53d63016cc79..e670c0c8a88e544cc189c429a34a5c625cd51359 100644 (file)
@@ -1,11 +1,5 @@
-This test checks that the first <script> tag after an unclosed <style> tag is parsed correctly. Early versions of the patch for Bugzilla Bug 6314 did not reset a state variable properly, causing the first <script></script> tag in the document to contain everything after the <style> tag.
-
-This text should also be blue.
-
-On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
-
-
-PASS successfullyParsed is true
-
-TEST COMPLETE
-
+layer at (0,0) size 800x600
+  RenderCanvas at (0,0) size 800x600
+layer at (0,0) size 800x600
+  RenderBlock {HTML} at (0,0) size 800x600
+    RenderBody {BODY} at (8,8) size 784x584
index 0567d709f162c8c772c2912dca3995065325e219..d69a371bd164f06577de22a549cab84c4e72938c 100644 (file)
@@ -1,2 +1 @@
-b2143a64532af6bc89a2baf5f5c82ee9
-\ No newline at end of file
+853de00567d121bea0b7bece66a5d61c
\ No newline at end of file
index 41ed71069efc12031a741c0088720cdf451d0f66..113fea49283c2cad5bcdb79a1e5f8d7c4fd56de7 100644 (file)
Binary files a/LayoutTests/fast/tokenizer/missing-style-end-tag-1-expected.png and b/LayoutTests/fast/tokenizer/missing-style-end-tag-1-expected.png differ
index f5a3a19b0885f9eb639c6cdc8c42c2a5e0086965..e670c0c8a88e544cc189c429a34a5c625cd51359 100644 (file)
@@ -2,17 +2,4 @@ layer at (0,0) size 800x600
   RenderCanvas at (0,0) size 800x600
 layer at (0,0) size 800x600
   RenderBlock {HTML} at (0,0) size 800x600
-    RenderBody {BODY} at (8,8) size 784x579
-      RenderBlock {DIV} at (0,0) size 784x36
-        RenderText {TEXT} at (0,0) size 779x36
-          text run at (0,0) width 332: "This document is missing its </style> tag in its head. "
-          text run at (332,0) width 447: "The tokenizer should retokenize this document after consuming all of it"
-          text run at (0,18) width 504: "looking for the missing end tag, then let the parser clean up the missing tag. See "
-        RenderInline {A} at (0,0) size 120x18 [color=#0000EE]
-          RenderText {TEXT} at (504,18) size 120x18
-            text run at (504,18) width 120: "Bugzilla Bug 6314"
-        RenderText {TEXT} at (624,18) size 4x18
-          text run at (624,18) width 4: "."
-      RenderBlock {P} at (0,49) size 784x15
-        RenderText {TEXT} at (0,0) size 280x15
-          text run at (0,0) width 280: "This text should also be monospace."
+    RenderBody {BODY} at (8,8) size 784x584
index e707c1a2216f8894f95747c58887f0fd09456180..d69a371bd164f06577de22a549cab84c4e72938c 100644 (file)
@@ -1,2 +1 @@
-f8f76ddf9c676bfec58b9dff1580aaa2
-\ No newline at end of file
+853de00567d121bea0b7bece66a5d61c
\ No newline at end of file
index 5c77f4834eecf67d6b06b9a7e5964c31eb626076..113fea49283c2cad5bcdb79a1e5f8d7c4fd56de7 100644 (file)
Binary files a/LayoutTests/fast/tokenizer/missing-style-end-tag-2-expected.png and b/LayoutTests/fast/tokenizer/missing-style-end-tag-2-expected.png differ
index def7565042b00a8e244a145ce6c3157da884397c..e670c0c8a88e544cc189c429a34a5c625cd51359 100644 (file)
@@ -2,17 +2,4 @@ layer at (0,0) size 800x600
   RenderCanvas at (0,0) size 800x600
 layer at (0,0) size 800x600
   RenderBlock {HTML} at (0,0) size 800x600
-    RenderBody {BODY} at (8,8) size 784x579
-      RenderBlock {DIV} at (0,0) size 784x36
-        RenderText {TEXT} at (0,0) size 781x36
-          text run at (0,0) width 334: "This document is missing its </style> tag in its body. "
-          text run at (334,0) width 447: "The tokenizer should retokenize this document after consuming all of it"
-          text run at (0,18) width 504: "looking for the missing end tag, then let the parser clean up the missing tag. See "
-        RenderInline {A} at (0,0) size 120x18 [color=#0000EE]
-          RenderText {TEXT} at (504,18) size 120x18
-            text run at (504,18) width 120: "Bugzilla Bug 6314"
-        RenderText {TEXT} at (624,18) size 4x18
-          text run at (624,18) width 4: "."
-      RenderBlock {P} at (0,49) size 784x15
-        RenderText {TEXT} at (0,0) size 280x15
-          text run at (0,0) width 280: "This text should also be monospace."
+    RenderBody {BODY} at (8,8) size 784x584
diff --git a/LayoutTests/tables/mozilla/marvin/backgr_layers-opacity-expected.checksum b/LayoutTests/tables/mozilla/marvin/backgr_layers-opacity-expected.checksum
new file mode 100644 (file)
index 0000000..80878b3
--- /dev/null
@@ -0,0 +1 @@
+23b08045480e5d81a5006ae190a09e2c
\ No newline at end of file
diff --git a/LayoutTests/tables/mozilla/marvin/backgr_layers-opacity-expected.png b/LayoutTests/tables/mozilla/marvin/backgr_layers-opacity-expected.png
new file mode 100644 (file)
index 0000000..1efd68a
Binary files /dev/null and b/LayoutTests/tables/mozilla/marvin/backgr_layers-opacity-expected.png differ
index 7f6a6b8a2d9b9015df855b2b3095915fe474e63e..b3f185f0671c3826d55eac5a66e45716a0dd838c 100644 (file)
@@ -1,3 +1,14 @@
+2006-03-19  Darin Adler  <darin@apple.com>
+
+        - roll out fix for http://bugzilla.opendarwin.org/show_bug.cgi?id=6314
+          Unclosed <style> element in <head> makes page completely blank
+
+        This fix was breaking major sites -- details in the bug report.
+
+        * khtml/html/htmltokenizer.cpp: (WebCore::HTMLTokenizer::parseTag):
+        Removed the bug fix, added a FIXME about the <title> code that has
+        the same problem.
+
 2006-03-18  David Carson  <dacarson@gmail.com>
 
         Test: fast/canvas/patternfill-repeat.html
index 177278d4f4d1e49e4adbe249842f8314c7a59255..fd18595df2ee772db15764b82325527fb2de98dc 100644 (file)
@@ -1252,20 +1252,8 @@ HTMLTokenizer::State HTMLTokenizer::parseTag(SegmentedString &src, State state)
                 if (beginTag) {
                     searchStopper = styleEnd;
                     searchStopperLen = 7;
-                    State savedState = state;
-                    SegmentedString savedSrc = src;
-                    long savedLineno = lineno;
                     state.setInStyle(true);
                     state = parseSpecial(src, state);
-                    if (state.inStyle() && src.isEmpty()) {
-                        // We just ate the rest of the document as the style #text node!
-                        // Reset the state then retokenize without special style handling.
-                        // Let the html parser clean up the missing </style> tag.
-                        state = savedState;
-                        src = savedSrc;
-                        lineno = savedLineno;
-                        scriptCodeSize = 0;
-                    }
                 }
             } else if (tagName == textareaTag) {
                 if (beginTag) {
@@ -1286,7 +1274,11 @@ HTMLTokenizer::State HTMLTokenizer::parseTag(SegmentedString &src, State state)
                     if (state.inTitle() && src.isEmpty()) {
                         // We just ate the rest of the document as the title #text node!
                         // Reset the state then retokenize without special title handling.
-                        // Let the html parser clean up the missing </title> tag.
+                        // Let the parser clean up the missing </title> tag.
+                        // FIXME: This is incorrect, because src.isEmpty() doesn't mean we're
+                        // at the end of the document unless noMoreData is also true. We need
+                        // to detect this case elsewhere, and save the state somewhere other
+                        // than a local variable.
                         state = savedState;
                         src = savedSrc;
                         lineno = savedLineno;