Title: [103133] trunk
- Revision
- 103133
- Author
- [email protected]
- Date
- 2011-12-16 17:19:36 -0800 (Fri, 16 Dec 2011)
Log Message
<option><span><option> doesn't parse correctly
https://bugs.webkit.org/show_bug.cgi?id=74760
Reviewed by Eric Seidel.
Source/WebCore:
The <option> start tag shouldn't be quite as aggressive in closing open
<option> tags. I'm not sure whether this was a change in the spec or a
mistranscription, but this patch causes us to match the spec. I've
checked the other optionTag checks, and they all seem to be correct.
* html/parser/HTMLTreeBuilder.cpp:
LayoutTests:
Show test progression.
* html5lib/runner-expected.txt:
Modified Paths
Diff
Modified: trunk/LayoutTests/ChangeLog (103132 => 103133)
--- trunk/LayoutTests/ChangeLog 2011-12-17 01:03:36 UTC (rev 103132)
+++ trunk/LayoutTests/ChangeLog 2011-12-17 01:19:36 UTC (rev 103133)
@@ -1,3 +1,14 @@
+2011-12-16 Adam Barth <[email protected]>
+
+ <option><span><option> doesn't parse correctly
+ https://bugs.webkit.org/show_bug.cgi?id=74760
+
+ Reviewed by Eric Seidel.
+
+ Show test progression.
+
+ * html5lib/runner-expected.txt:
+
2011-12-16 Brady Eidson <[email protected]>
<rdar://problem/10576732> and https://bugs.webkit.org/show_bug.cgi?id=74533
Modified: trunk/LayoutTests/html5lib/runner-expected.txt (103132 => 103133)
--- trunk/LayoutTests/html5lib/runner-expected.txt 2011-12-17 01:03:36 UTC (rev 103132)
+++ trunk/LayoutTests/html5lib/runner-expected.txt 2011-12-17 01:19:36 UTC (rev 103133)
@@ -158,25 +158,8 @@
resources/tests19.dat: PASS
-resources/tests20.dat:
-31
+resources/tests20.dat: PASS
-Test 31 of 39 in resources/tests20.dat failed. Input:
-<option><span><option>
-Got:
-| <html>
-| <head>
-| <body>
-| <option>
-| <span>
-| <option>
-Expected:
-| <html>
-| <head>
-| <body>
-| <option>
-| <span>
-| <option>
resources/tests21.dat: PASS
resources/tests22.dat:
Modified: trunk/LayoutTests/platform/chromium/html5lib/runner-expected.txt (103132 => 103133)
--- trunk/LayoutTests/platform/chromium/html5lib/runner-expected.txt 2011-12-17 01:03:36 UTC (rev 103132)
+++ trunk/LayoutTests/platform/chromium/html5lib/runner-expected.txt 2011-12-17 01:19:36 UTC (rev 103133)
@@ -158,25 +158,8 @@
resources/tests19.dat: PASS
-resources/tests20.dat:
-31
+resources/tests20.dat: PASS
-Test 31 of 39 in resources/tests20.dat failed. Input:
-<option><span><option>
-Got:
-| <html>
-| <head>
-| <body>
-| <option>
-| <span>
-| <option>
-Expected:
-| <html>
-| <head>
-| <body>
-| <option>
-| <span>
-| <option>
resources/tests21.dat: PASS
resources/tests22.dat:
Modified: trunk/Source/WebCore/ChangeLog (103132 => 103133)
--- trunk/Source/WebCore/ChangeLog 2011-12-17 01:03:36 UTC (rev 103132)
+++ trunk/Source/WebCore/ChangeLog 2011-12-17 01:19:36 UTC (rev 103133)
@@ -1,3 +1,17 @@
+2011-12-16 Adam Barth <[email protected]>
+
+ <option><span><option> doesn't parse correctly
+ https://bugs.webkit.org/show_bug.cgi?id=74760
+
+ Reviewed by Eric Seidel.
+
+ The <option> start tag shouldn't be quite as aggressive in closing open
+ <option> tags. I'm not sure whether this was a change in the spec or a
+ mistranscription, but this patch causes us to match the spec. I've
+ checked the other optionTag checks, and they all seem to be correct.
+
+ * html/parser/HTMLTreeBuilder.cpp:
+
2011-12-16 Rafael Weinstein <[email protected]>
[MutationObservers] Remove platform-dependent code in Document.cpp resulting from Mutation Event histogram collection
Modified: trunk/Source/WebCore/html/parser/HTMLTreeBuilder.cpp (103132 => 103133)
--- trunk/Source/WebCore/html/parser/HTMLTreeBuilder.cpp 2011-12-17 01:03:36 UTC (rev 103132)
+++ trunk/Source/WebCore/html/parser/HTMLTreeBuilder.cpp 2011-12-17 01:19:36 UTC (rev 103133)
@@ -995,7 +995,7 @@
return;
}
if (token.name() == optgroupTag || token.name() == optionTag) {
- if (m_tree.openElements()->inScope(optionTag.localName())) {
+ if (m_tree.currentNode()->hasTagName(optionTag)) {
AtomicHTMLToken endOption(HTMLTokenTypes::EndTag, optionTag.localName());
processEndTag(endOption);
}
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
