Changeset 104263 in webkit

Timestamp:

Jan 5, 2012 7:14:05 PM (12 years ago)

Author:

rniwa@webkit.org

Message:

REGRESSION(r104210): Dromaeo DOM test score is lower
​https://bugs.webkit.org/show_bug.cgi?id=75679

Reviewed by Andreas Kling.

The regression was caused by isDomVersionConsistent not being able to obtain the tree version
inside isLengthCacheValid when m_cachedItem is null. Fix the regression by always setting
m_cachedItem to some node when caching the length so that we can obtain the tree version later.

Also address Antti's review comment to fit m_cachedLength, m_isLengthCacheValid, and
m_isItemCacheValid all in 32-bit.

• dom/DynamicNodeList.cpp:

(WebCore::DynamicSubtreeNodeList::SubtreeCaches::setLengthCache):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• dom/DynamicNodeList.cpp (modified) (1 diff)
• dom/DynamicNodeList.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-01-05  Ryosuke Niwa  <rniwa@webkit.org>
+
+        REGRESSION(r104210): Dromaeo DOM test score is lower
+        https://bugs.webkit.org/show_bug.cgi?id=75679
+
+        Reviewed by Andreas Kling.
+
+        The regression was caused by isDomVersionConsistent not being able to obtain the tree version
+        inside isLengthCacheValid when m_cachedItem is null. Fix the regression by always setting
+        m_cachedItem to some node when caching the length so that we can obtain the tree version later.
+
+        Also address Antti's review comment to fit m_cachedLength, m_isLengthCacheValid, and
+        m_isItemCacheValid all in 32-bit.
+
+        * dom/DynamicNodeList.cpp:
+        (WebCore::DynamicSubtreeNodeList::SubtreeCaches::setLengthCache):
+
 2012-01-05  Hajime Morrita  <morrita@chromium.org>
 

trunk/Source/WebCore/dom/DynamicNodeList.cpp

@@ -42 +42 @@
         m_cachedItem = node;
         m_isItemCacheValid = false;
-    }
+    } else if (!m_isItemCacheValid)
+        m_cachedItem = node; // Used in domVersionIsConsistent.
     m_cachedLength = length;
     m_isLengthCacheValid = true;

trunk/Source/WebCore/dom/DynamicNodeList.h

@@ -101 +101 @@
         Node* m_cachedItem;
         unsigned m_cachedItemOffset;
-        unsigned m_cachedLength;
-        bool m_isLengthCacheValid : 1;
-        bool m_isItemCacheValid : 1;
+        unsigned m_cachedLength : 30;
+        unsigned m_isLengthCacheValid : 1;
+        unsigned m_isItemCacheValid : 1;
 
         bool domVersionIsConsistent() const