Changeset 171261 in webkit

Timestamp:

Jul 19, 2014 3:08:55 AM (10 years ago)

Author:

zandobersek@gmail.com

Message:

Document::unregisterNodeListforInvalidation() and Document::unregisterCollection() have incorrect assertions
​https://bugs.webkit.org/show_bug.cgi?id=134869

Reviewed by Darin Adler.

Both methods should assert that the relevant HashMap is either empty if invalidation originates
from Document::invalidateNodeListAndCollectionCaches() or acutally contains the element that is
being invalidated. In the first case the HashMap is empty because its entries were moved out in
the Document::invalidateNodeListAndCollectionCaches().

This was exposed by r170995 (later rolled out in r170999) which introduced move constructor and
move assignment operators for HashTable. The assertions in the titular methods won't be passing
until r170995 relands.

• dom/Document.cpp:

(WebCore::Document::unregisterNodeListForInvalidation):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• dom/Document.cpp (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2014-07-19  Zan Dobersek  <zdobersek@igalia.com>
+
+        Document::unregisterNodeListforInvalidation() and Document::unregisterCollection() have incorrect assertions
+        https://bugs.webkit.org/show_bug.cgi?id=134869
+
+        Reviewed by Darin Adler.
+
+        Both methods should assert that the relevant HashMap is either empty if invalidation originates
+        from Document::invalidateNodeListAndCollectionCaches() or acutally contains the element that is
+        being invalidated. In the first case the HashMap is empty because its entries were moved out in
+        the Document::invalidateNodeListAndCollectionCaches().
+
+        This was exposed by r170995 (later rolled out in r170999) which introduced move constructor and
+        move assignment operators for HashTable. The assertions in the titular methods won't be passing
+        until r170995 relands.
+
+        * dom/Document.cpp:
+        (WebCore::Document::unregisterNodeListForInvalidation):
+
 2014-07-18  Eric Carlson  <eric.carlson@apple.com>
 

trunk/Source/WebCore/dom/Document.cpp

@@ -3492 +3492 @@
     if (!list.isRegisteredForInvalidationAtDocument())
         return;
-    if (!m_listsInvalidatedAtDocument.size()) {
-        ASSERT(m_inInvalidateNodeListAndCollectionCaches);
-        return;
-    }
-    ASSERT(m_listsInvalidatedAtDocument.contains(&list));
+
+    list.setRegisteredForInvalidationAtDocument(false);
+    ASSERT(m_inInvalidateNodeListAndCollectionCaches
+        ? m_listsInvalidatedAtDocument.isEmpty()
+        : m_listsInvalidatedAtDocument.contains(&list));
     m_listsInvalidatedAtDocument.remove(&list);
-    list.setRegisteredForInvalidationAtDocument(false);
 }
 
@@ -3512 +3511 @@
     ASSERT(m_nodeListAndCollectionCounts[collection.invalidationType()]);
     m_nodeListAndCollectionCounts[collection.invalidationType()]--;
-    if (collection.isRootedAtDocument()) {
-        if (!m_collectionsInvalidatedAtDocument.size()) {
-            ASSERT(m_inInvalidateNodeListAndCollectionCaches);
-            return;
-        }
-        ASSERT(m_collectionsInvalidatedAtDocument.contains(&collection));
-        m_collectionsInvalidatedAtDocument.remove(&collection);
-    }
+    if (!collection.isRootedAtDocument())
+        return;
+
+    ASSERT(m_inInvalidateNodeListAndCollectionCaches
+        ? m_collectionsInvalidatedAtDocument.isEmpty()
+        : m_collectionsInvalidatedAtDocument.contains(&collection));
+    m_collectionsInvalidatedAtDocument.remove(&collection);
 }