Changeset 143673 in webkit

Timestamp:

Feb 21, 2013 5:27:56 PM (11 years ago)

Author:

eric@webkit.org

Message:

tables/mozilla/bugs/bug8950.html fails with threaded parser due to attribute duplication
​https://bugs.webkit.org/show_bug.cgi?id=110532

Reviewed by Adam Barth.

This is a very basic failure which we should have caught earlier with the html5lib parser
tests, except those use document.write and thus avoid the threaded parser.

AtomicHTMLToken expects its attributes to be unique. We were not doing that for the
CompactHTMLToken path, and this ancient mozilla table test caught that.

Fixes tables/mozilla/bugs/bug8950.html.

• html/parser/AtomicHTMLToken.h:

(WebCore::AtomicHTMLToken::AtomicHTMLToken):
(WebCore::AtomicHTMLToken::initializeAttributes):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• html/parser/AtomicHTMLToken.h (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-02-21  Eric Seidel  <eric@webkit.org>
+
+        tables/mozilla/bugs/bug8950.html fails with threaded parser due to attribute duplication
+        https://bugs.webkit.org/show_bug.cgi?id=110532
+
+        Reviewed by Adam Barth.
+
+        This is a very basic failure which we should have caught earlier with the html5lib parser
+        tests, except those use document.write and thus avoid the threaded parser.
+
+        AtomicHTMLToken expects its attributes to be unique.  We were not doing that for the
+        CompactHTMLToken path, and this ancient mozilla table test caught that.
+
+        Fixes tables/mozilla/bugs/bug8950.html.
+
+        * html/parser/AtomicHTMLToken.h:
+        (WebCore::AtomicHTMLToken::AtomicHTMLToken):
+        (WebCore::AtomicHTMLToken::initializeAttributes):
+
 2013-02-21  Adam Barth  <abarth@webkit.org>
 

trunk/Source/WebCore/html/parser/AtomicHTMLToken.h

@@ -202 +202 @@
         case HTMLToken::StartTag:
             m_attributes.reserveInitialCapacity(token.attributes().size());
-            for (Vector<CompactHTMLToken::Attribute>::const_iterator it = token.attributes().begin(); it != token.attributes().end(); ++it)
-                m_attributes.append(Attribute(QualifiedName(nullAtom, it->name, nullAtom), it->value));
+            for (Vector<CompactHTMLToken::Attribute>::const_iterator it = token.attributes().begin(); it != token.attributes().end(); ++it) {
+                QualifiedName name(nullAtom, it->name, nullAtom);
+                // FIXME: This is N^2 for the number of attributes.
+                if (!findAttributeInVector(m_attributes, name))
+                    m_attributes.append(Attribute(name, it->value));
+            }
             // Fall through!
         case HTMLToken::EndTag:
@@ -301 +305 @@
         AtomicString value(attribute.value);
         const QualifiedName& name = nameForAttribute(attribute);
+        // FIXME: This is N^2 for the number of attributes.
         if (!findAttributeInVector(m_attributes, name))
             m_attributes.append(Attribute(name, value));