Changeset 116032 in webkit

Timestamp:

May 3, 2012 3:50:10 PM (12 years ago)

Author:

jchaffraix@webkit.org

Message:

ASSERT(!m_zOrderListsDirty) is triggering in Safari
​https://bugs.webkit.org/show_bug.cgi?id=85512

Reviewed by Simon Fraser.

Unfortunately no test as I don't think the 2 cases are testable reliably.

A better fix would be to introduce some iterator that handle updating the
lists for you. For now, just adding the missing updateLayerListsIfNeeded()
calls.

• rendering/RenderLayerBacking.cpp:

(WebCore::RenderLayerBacking::hasVisibleNonCompositingDescendantLayers):

• rendering/RenderLayerCompositor.cpp:

(WebCore::RenderLayerCompositor::layerHas3DContent):

Location:

trunk/Source/WebCore

Files:

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

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-05-03  Julien Chaffraix  <jchaffraix@webkit.org>
+
+        ASSERT(!m_zOrderListsDirty) is triggering in Safari
+        https://bugs.webkit.org/show_bug.cgi?id=85512
+
+        Reviewed by Simon Fraser.
+
+        Unfortunately no test as I don't think the 2 cases are testable reliably.
+
+        A better fix would be to introduce some iterator that handle updating the
+        lists for you. For now, just adding the missing updateLayerListsIfNeeded()
+        calls.
+
+        * rendering/RenderLayerBacking.cpp:
+        (WebCore::RenderLayerBacking::hasVisibleNonCompositingDescendantLayers):
+        * rendering/RenderLayerCompositor.cpp:
+        (WebCore::RenderLayerCompositor::layerHas3DContent):
+
 2012-05-03  Philip Rogers  <pdr@google.com>
 

trunk/Source/WebCore/rendering/RenderLayerBacking.cpp

@@ -908 +908 @@
 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);

trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp

@@ -2247 +2247 @@
         return true;
 
+    const_cast<RenderLayer*>(layer)->updateLayerListsIfNeeded();
+
 #if !ASSERT_DISABLED
     LayerListMutationDetector mutationChecker(const_cast<RenderLayer*>(layer));