<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:

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

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 27d130e..786c2ca 100644 (file)
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,14 @@
+2011-12-16  Adam Barth  <abarth@webkit.org>
+
+        <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  <beidson@apple.com>
 
         <rdar://problem/10576732> and https://bugs.webkit.org/show_bug.cgi?id=74533

diff --git a/LayoutTests/html5lib/runner-expected.txt b/LayoutTests/html5lib/runner-expected.txt
index 9d6c98c..2f5fc63 100644 (file)
Binary files a/LayoutTests/html5lib/runner-expected.txt and b/LayoutTests/html5lib/runner-expected.txt differ

diff --git a/LayoutTests/platform/chromium/html5lib/runner-expected.txt b/LayoutTests/platform/chromium/html5lib/runner-expected.txt
index 1c2b564..b93f342 100644 (file)
Binary files a/LayoutTests/platform/chromium/html5lib/runner-expected.txt and b/LayoutTests/platform/chromium/html5lib/runner-expected.txt differ

diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index 076a674..6951af9 100644 (file)
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,17 @@
+2011-12-16  Adam Barth  <abarth@webkit.org>
+
+        <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  <rafaelw@chromium.org>
 
         [MutationObservers] Remove platform-dependent code in Document.cpp resulting from Mutation Event histogram collection

diff --git a/Source/WebCore/html/parser/HTMLTreeBuilder.cpp b/Source/WebCore/html/parser/HTMLTreeBuilder.cpp
index 28e5f9f..ea99526 100644 (file)
--- a/Source/WebCore/html/parser/HTMLTreeBuilder.cpp
+++ b/Source/WebCore/html/parser/HTMLTreeBuilder.cpp
@@ -995,7 +995,7 @@ void HTMLTreeBuilder::processStartTagForInBody(AtomicHTMLToken& token)
         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);
         }