Changeset 86713 in webkit

Timestamp:

May 17, 2011 3:34:22 PM (13 years ago)

Author:

commit-queue@webkit.org

Message:

2011-05-17 Nat Duca <​nduca@chromium.org>

Reviewed by James Robinson.

[chromium] Always set layerRenderer, even on non-drawn-layers
​https://bugs.webkit.org/show_bug.cgi?id=60977

This is a defensive fixe for crbug.com/82799, in which
a RenderLayer could not prepare itself because its owning layerImpl
had no associated layerRenderer. The underlying issue is that we
sometimes put renderSurfaces onto the list that won't actually render.
For now, the priority is to reduce fragility so that invisible layers
dont lead to crashers. We do this by being more agressive about
binding CCLayerImpls to the LayerRenderer, doing it all the time rather
than only when we think it will get rendered.

• platform/graphics/chromium/LayerRendererChromium.cpp: (WebCore::LayerRendererChromium::paintLayerContents):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/chromium/LayerRendererChromium.cpp (modified) (3 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-05-17  Nat Duca  <nduca@chromium.org>
+
+        Reviewed by James Robinson.
+
+        [chromium] Always set layerRenderer, even on non-drawn-layers
+        https://bugs.webkit.org/show_bug.cgi?id=60977
+
+        This is a defensive fixe for crbug.com/82799, in which
+        a RenderLayer could not prepare itself because its owning layerImpl
+        had no associated layerRenderer. The underlying issue is that we
+        sometimes put renderSurfaces onto the list that won't actually render.
+        For now, the priority is to reduce fragility so that invisible layers
+        dont lead to crashers. We do this by being more agressive about 
+        binding CCLayerImpls to the LayerRenderer, doing it all the time rather
+        than only when we think it will get rendered.
+
+        * platform/graphics/chromium/LayerRendererChromium.cpp:
+        (WebCore::LayerRendererChromium::paintLayerContents):
+
 2011-05-17  Anders Carlsson  <andersca@apple.com>
 

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

@@ -356 +356 @@
         ASSERT(renderSurface);
 
+        // Make sure any renderSurfaceLayer is associated with this layerRenderer.
+        // This is a defensive assignment in case the owner of this layer hasn't
+        // set the layerRenderer on this layer already.
+        renderSurfaceLayer->setLayerRenderer(this);
+
         // Render surfaces whose drawable area has zero width or height
         // will have no layers associated with them and should be skipped.
@@ -372 +377 @@
 
             LayerChromium* layer = ccLayerImpl->owner();
-            if (layer->bounds().isEmpty())
-                continue;
 
             layer->setLayerRenderer(this);
+
             if (layer->maskLayer())
                 layer->maskLayer()->setLayerRenderer(this);
@@ -383 +387 @@
                     layer->replicaLayer()->maskLayer()->setLayerRenderer(this);
             }
+
+            if (layer->bounds().isEmpty())
+              continue;
 
             IntRect targetSurfaceRect = ccLayerImpl->targetRenderSurface() ? ccLayerImpl->targetRenderSurface()->contentRect() : m_defaultRenderSurface->contentRect();