Changeset 142815 in webkit

Timestamp:

Feb 13, 2013 3:43:01 PM (11 years ago)

Author:

shawnsingh@chromium.org

Message:

Fix debug assertion being triggered because we may access dirty normalFlowList.
​https://bugs.webkit.org/show_bug.cgi?id=109740

A debug assertion in RenderLayer.h is being hit when trying to
access the normalFlowList when it is dirty. This is caused by a
new recursion that I added in RenderLayerBacking::hasVisibleNonCompositingDescendant(),
but I overlooked the need to call updateLayerListsIfNeeded()
recursively as well.

Reviewed by Simon Fraser.

No test, because there's no reliable way to test this (same as bug 85512).

• rendering/RenderLayerBacking.cpp:

(WebCore::hasVisibleNonCompositingDescendant):
(WebCore::RenderLayerBacking::hasVisibleNonCompositingDescendantLayers):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• rendering/RenderLayerBacking.cpp (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-02-13  Shawn Singh  <shawnsingh@chromium.org>
+
+        Fix debug assertion being triggered because we may access dirty normalFlowList.
+        https://bugs.webkit.org/show_bug.cgi?id=109740
+
+        A debug assertion in RenderLayer.h is being hit when trying to
+        access the normalFlowList when it is dirty.  This is caused by a
+        new recursion that I added in RenderLayerBacking::hasVisibleNonCompositingDescendant(),
+        but I overlooked the need to call updateLayerListsIfNeeded()
+        recursively as well.
+
+        Reviewed by Simon Fraser.
+
+        No test, because there's no reliable way to test this (same as bug 85512).
+
+        * rendering/RenderLayerBacking.cpp:
+        (WebCore::hasVisibleNonCompositingDescendant):
+        (WebCore::RenderLayerBacking::hasVisibleNonCompositingDescendantLayers):
+
 2013-02-13  Antti Koivisto  <antti@apple.com>
 

trunk/Source/WebCore/rendering/RenderLayerBacking.cpp

@@ -1432 +1432 @@
 static bool hasVisibleNonCompositingDescendant(RenderLayer* parent)
 {
+    // FIXME: We shouldn't be called with a stale z-order lists. See bug 85512.
+    parent->updateLayerListsIfNeeded();
+
+#if !ASSERT_DISABLED
+    LayerListMutationDetector mutationChecker(parent);
+#endif
+
     if (Vector<RenderLayer*>* normalFlowList = parent->normalFlowList()) {
         size_t listSize = normalFlowList->size();
@@ -1474 +1481 @@
 bool RenderLayerBacking::hasVisibleNonCompositingDescendantLayers() const
 {
-    // FIXME: We shouldn't be called with a stale z-order lists. See bug 85512.
-    m_owningLayer->updateLayerListsIfNeeded();
-
-#if !ASSERT_DISABLED
-    LayerListMutationDetector mutationChecker(m_owningLayer);
-#endif
-
     return hasVisibleNonCompositingDescendant(m_owningLayer);
 }