Changeset 25341 in webkit

Timestamp:

Sep 1, 2007 1:08:33 AM (17 years ago)

Author:

rwlbuis

Message:

Reviewed by Darin.

​http://bugs.webkit.org/show_bug.cgi?id=12988
First element (in document order) is not returned when other duplicate ID-ed elements were created first

Reset the element id cache when id's are added or removed and there
are duplicates for that id.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/dom/duplicate-ids-document-order-expected.txt (added)
• LayoutTests/fast/dom/duplicate-ids-document-order.html (added)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/dom/Document.cpp (modified) (3 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2007-09-01  Rob Buis  <buis@kde.org>
+
+        Reviewed by Darin.
+
+        Testcase for:
+        http://bugs.webkit.org/show_bug.cgi?id=12988
+        First element (in document order) is not returned when other duplicate ID-ed elements were created first
+
+        * fast/dom/duplicate-ids-document-order-expected.txt: Added.
+        * fast/dom/duplicate-ids-document-order.html: Added.
+
 2007-08-31  Alice Liu  <alice.liu@apple.com>
 

trunk/WebCore/ChangeLog

@@ +1 @@
+2007-09-01  Rob Buis  <buis@kde.org>
+
+        Reviewed by Darin.
+
+        http://bugs.webkit.org/show_bug.cgi?id=12988
+        First element (in document order) is not returned when other duplicate ID-ed elements were created first
+
+        Reset the element id cache when id's are added or removed and there
+        are duplicates for that id.
+
+        Tests: fast/dom/duplicate-ids-document-order.html
+
+        * dom/Document.cpp:
+        (WebCore::Document::getElementById):
+        (WebCore::Document::addElementById):
+        (WebCore::Document::removeElementById):
+
 2007-09-01  Rob Buis  <buis@kde.org>
 

trunk/WebCore/dom/Document.cpp

@@ -705 +705 @@
                 element = static_cast<Element*>(n);
                 if (element->hasID() && element->getAttribute(idAttr) == elementId) {
-                    m_duplicateIds.remove(elementId.impl());
                     m_elementsById.set(elementId.impl(), element);
                     return element;
@@ -807 +806 @@
     if (!m_elementsById.contains(elementId.impl()))
         m_elementsById.set(elementId.impl(), element);
-    else
+    else {
         m_duplicateIds.add(elementId.impl());
+        m_elementsById.remove(elementId.impl());
+    }
 }
 
@@ -815 +816 @@
     if (m_elementsById.get(elementId.impl()) == element)
         m_elementsById.remove(elementId.impl());
-    else
+    else {
         m_duplicateIds.remove(elementId.impl());
+        m_elementsById.remove(elementId.impl());
+    }
 }