Changeset 76864 in webkit

Timestamp:

Jan 27, 2011 4:50:34 PM (13 years ago)

Author:

enne@google.com

Message:

2011-01-27 Adrienne Walker <​enne@google.com>

Reviewed by James Robinson.

[chromium] Tiled compositor crashes if compositing turned off mid-paint
​https://bugs.webkit.org/show_bug.cgi?id=53198

• platform/graphics/chromium/LayerRendererChromium.cpp: (WebCore::LayerRendererChromium::drawLayers):
• platform/graphics/chromium/LayerTilerChromium.cpp: (WebCore::LayerTilerChromium::update): (WebCore::LayerTilerChromium::draw):

Location:

trunk/Source/WebCore

Files:

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

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-01-27  Adrienne Walker  <enne@google.com>
+
+        Reviewed by James Robinson.
+
+        [chromium] Tiled compositor crashes if compositing turned off mid-paint
+        https://bugs.webkit.org/show_bug.cgi?id=53198
+
+        * platform/graphics/chromium/LayerRendererChromium.cpp:
+        (WebCore::LayerRendererChromium::drawLayers):
+        * platform/graphics/chromium/LayerTilerChromium.cpp:
+        (WebCore::LayerTilerChromium::update):
+        (WebCore::LayerTilerChromium::draw):
+
 2011-01-27  Carol Szabo <carol.szabo@nokia.com>
 

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

@@ -266 +266 @@
     m_context->colorMask(true, true, true, true);
 
+    // Recheck that we still have a root layer.  This may become null if
+    // compositing gets turned off during a paint operation.
+    if (!m_rootLayer)
+        return;
+
     // Set the root visible/content rects --- used by subsequent drawLayers calls.
     m_rootVisibleRect = visibleRect;

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

@@ -300 +300 @@
 #endif
 
+    // Painting could cause compositing to get turned off, which may cause the tiler to become invalidated mid-update.
+    if (!m_tiles.size())
+        return;
+
     for (int j = top; j <= bottom; ++j) {
         for (int i = left; i <= right; ++i) {
@@ -358 +362 @@
 void LayerTilerChromium::draw(const IntRect& contentRect)
 {
-    if (m_skipsDraw)
+    if (m_skipsDraw || !m_tiles.size())
         return;