Changeset 90587 in webkit

Timestamp:

Jul 7, 2011 1:37:44 PM (13 years ago)

Author:

enne@google.com

Message:

[chromium] Fix crash when compositing gets disabled mid-paint
​https://bugs.webkit.org/show_bug.cgi?id=64119

Reviewed by James Robinson.

WebKit paint can disable compositing and call setRootLayer(0). Adding
a check for this in drawLayers prevents a null pointer deref.

• platform/graphics/chromium/LayerRendererChromium.cpp:

(WebCore::LayerRendererChromium::drawLayers):

Location:

trunk/Source/WebCore

Files:

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

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-07-07  Adrienne Walker  <enne@google.com>
+
+        [chromium] Fix crash when compositing gets disabled mid-paint
+        https://bugs.webkit.org/show_bug.cgi?id=64119
+
+        Reviewed by James Robinson.
+
+        WebKit paint can disable compositing and call setRootLayer(0). Adding
+        a check for this in drawLayers prevents a null pointer deref.
+
+        * platform/graphics/chromium/LayerRendererChromium.cpp:
+        (WebCore::LayerRendererChromium::drawLayers):
+
 2011-07-07  Dirk Schulze  <krit@webkit.org>
 

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

@@ -481 +481 @@
 void LayerRendererChromium::drawLayers(const LayerList& renderSurfaceLayerList)
 {
-    if (m_viewportVisibleRect.isEmpty())
+    if (m_viewportVisibleRect.isEmpty() || !m_rootLayer)
         return;