Changeset 85112 in webkit

Timestamp:

Apr 27, 2011 3:41:31 PM (13 years ago)

Author:

jamesr@google.com

Message:

2011-04-27 James Robinson <​jamesr@chromium.org>

Reviewed by Kenneth Russell.

[chromium] Ensure compositing layers are up to date before entering doComposite
​https://bugs.webkit.org/show_bug.cgi?id=59159

Adds some assertions to try to catch GraphicsLayer mutations at bad times (such as during
GraphicsLayerClient::paintContents() implementations).

• page/FrameView.cpp: (WebCore::FrameView::updateCompositingLayers):

Add an optional CompositingUpdateType parameter.

• page/FrameView.h:
• platform/graphics/chromium/GraphicsLayerChromium.cpp: (WebCore::GraphicsLayerChromium::updateLayerPreserves3D):
• platform/graphics/chromium/LayerChromium.cpp: (WebCore::LayerChromium::LayerChromium): (WebCore::LayerChromium::~LayerChromium):
• platform/graphics/chromium/LayerRendererChromium.cpp: (WebCore::LayerRendererChromium::updateLayers):
• platform/graphics/chromium/LayerRendererChromium.h: Add a set of assertions that we aren't creating or destroying LayerChromiums during paintContents
• rendering/RenderLayer.cpp: (WebCore::RenderLayer::dirtyZOrderLists): (WebCore::RenderLayer::updateCompositingAndLayerListsIfNeeded):
• rendering/RenderLayerCompositor.cpp: (WebCore::RenderLayerCompositor::updateCompositingLayers):
• rendering/RenderLayerCompositor.h: Fix a typo in CompositingUpdateType Pait->Paint

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• page/FrameView.cpp (modified) (2 diffs)
• page/FrameView.h (modified) (2 diffs)
• platform/graphics/chromium/GraphicsLayerChromium.cpp (modified) (1 diff)
• platform/graphics/chromium/LayerChromium.cpp (modified) (1 diff)
• platform/graphics/chromium/LayerRendererChromium.cpp (modified) (2 diffs)
• platform/graphics/chromium/LayerRendererChromium.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-04-27  James Robinson  <jamesr@chromium.org>
+
+        Reviewed by Kenneth Russell.
+
+        [chromium] Ensure compositing layers are up to date before entering doComposite
+        https://bugs.webkit.org/show_bug.cgi?id=59159
+
+        Adds some assertions to try to catch GraphicsLayer mutations at bad times (such as during
+        GraphicsLayerClient::paintContents() implementations).
+
+        * page/FrameView.cpp:
+        (WebCore::FrameView::updateCompositingLayers):
+            Add an optional CompositingUpdateType parameter.
+        * page/FrameView.h:
+        * platform/graphics/chromium/GraphicsLayerChromium.cpp:
+        (WebCore::GraphicsLayerChromium::updateLayerPreserves3D):
+        * platform/graphics/chromium/LayerChromium.cpp:
+        (WebCore::LayerChromium::LayerChromium):
+        (WebCore::LayerChromium::~LayerChromium):
+        * platform/graphics/chromium/LayerRendererChromium.cpp:
+        (WebCore::LayerRendererChromium::updateLayers):
+        * platform/graphics/chromium/LayerRendererChromium.h:
+          Add a set of assertions that we aren't creating or destroying LayerChromiums during paintContents
+        * rendering/RenderLayer.cpp:
+        (WebCore::RenderLayer::dirtyZOrderLists):
+        (WebCore::RenderLayer::updateCompositingAndLayerListsIfNeeded):
+        * rendering/RenderLayerCompositor.cpp:
+        (WebCore::RenderLayerCompositor::updateCompositingLayers):
+        * rendering/RenderLayerCompositor.h:
+          Fix a typo in CompositingUpdateType Pait->Paint
+
 2011-04-27  Pratik Solanki  <psolanki@apple.com>
 

trunk/Source/WebCore/page/FrameView.cpp

@@ -586 +586 @@
     
 #if USE(ACCELERATED_COMPOSITING)
-void FrameView::updateCompositingLayers()
+void FrameView::updateCompositingLayers(CompositingUpdateType updateType)
 {
     RenderView* view = m_frame->contentRenderer();
@@ -594 +594 @@
     // This call will make sure the cached hasAcceleratedCompositing is updated from the pref
     view->compositor()->cacheAcceleratedCompositingFlags();
-    view->compositor()->updateCompositingLayers(CompositingUpdateAfterLayoutOrStyleChange);
+    view->compositor()->updateCompositingLayers(updateType);
     
 #if ENABLE(FULLSCREEN_API)
     Document* document = m_frame->document();
     if (isDocumentRunningFullScreenAnimation(document))
-        view->compositor()->updateCompositingLayers(CompositingUpdateAfterLayoutOrStyleChange, document->fullScreenRenderer()->layer());
+        view->compositor()->updateCompositingLayers(updateType, document->fullScreenRenderer()->layer());
 #endif
 }

trunk/Source/WebCore/page/FrameView.h

@@ -33 +33 @@
 #include <wtf/Forward.h>
 #include <wtf/OwnPtr.h>
+
+#if USE(ACCELERATED_COMPOSITING)
+#include "RenderLayerCompositor.h" // For CompositingUpdateType
+#endif
 
 namespace WebCore {
@@ -106 +110 @@
 
 #if USE(ACCELERATED_COMPOSITING)
-    void updateCompositingLayers();
+    void updateCompositingLayers(CompositingUpdateType = CompositingUpdateAfterLayoutOrStyleChange);
     bool syncCompositingStateForThisFrame();
 

trunk/Source/WebCore/platform/graphics/chromium/GraphicsLayerChromium.cpp

@@ -589 +589 @@
     } else if (!m_preserves3D && m_transformLayer) {
         // Relace the transformLayer in the parent with this layer.
+        if (m_transformLayer->superlayer())
+            m_transformLayer->superlayer()->replaceSublayer(m_transformLayer.get(), m_layer.get());
         m_layer->removeFromSuperlayer();
-        m_transformLayer->superlayer()->replaceSublayer(m_transformLayer.get(), m_layer.get());
 
         // Release the transform layer.

trunk/Source/WebCore/platform/graphics/chromium/LayerChromium.cpp

@@ -82 +82 @@
     , m_replicaLayer(0)
 {
+    ASSERT(!LayerRendererChromium::s_inPaintLayerContents);
 }
 
 LayerChromium::~LayerChromium()
 {
+    ASSERT(!LayerRendererChromium::s_inPaintLayerContents);
     // Our superlayer should be holding a reference to us so there should be no
     // way for us to be destroyed while we still have a superlayer.

trunk/Source/WebCore/platform/graphics/chromium/LayerRendererChromium.cpp

@@ -60 +60 @@
 static size_t textureMemoryLimitBytes = 64 * 1024 * 1024;
 
+#ifndef NDEBUG
+bool LayerRendererChromium::s_inPaintLayerContents = false;
+#endif
+
 static TransformationMatrix orthoMatrix(float left, float right, float bottom, float top)
 {
@@ -284 +288 @@
     updatePropertiesAndRenderSurfaces(m_rootLayer.get(), identityMatrix, renderSurfaceLayerList, m_defaultRenderSurface->m_layerList);
 
+#ifndef NDEBUG
+    s_inPaintLayerContents = true;
+#endif
     paintLayerContents(renderSurfaceLayerList);
+#ifndef NDEBUG
+    s_inPaintLayerContents = false;
+#endif
 
     // FIXME: Before updateCompositorResourcesRecursive, when the compositor runs in

trunk/Source/WebCore/platform/graphics/chromium/LayerRendererChromium.h

@@ -135 +135 @@
     void removeChildContext(GraphicsContext3D*);
 
+#ifndef NDEBUG
+    static bool s_inPaintLayerContents;
+#endif
 private:
     typedef Vector<RefPtr<CCLayerImpl> > LayerList;