Title: [90587] trunk/Source/WebCore
- Revision
- 90587
- Author
- [email protected]
- Date
- 2011-07-07 13:37:44 -0700 (Thu, 07 Jul 2011)
Log 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):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (90586 => 90587)
--- trunk/Source/WebCore/ChangeLog 2011-07-07 20:26:19 UTC (rev 90586)
+++ trunk/Source/WebCore/ChangeLog 2011-07-07 20:37:44 UTC (rev 90587)
@@ -1,3 +1,16 @@
+2011-07-07 Adrienne Walker <[email protected]>
+
+ [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 <[email protected]>
SVGAnimateTransform does not support calcMode=discrete
Modified: trunk/Source/WebCore/platform/graphics/chromium/LayerRendererChromium.cpp (90586 => 90587)
--- trunk/Source/WebCore/platform/graphics/chromium/LayerRendererChromium.cpp 2011-07-07 20:26:19 UTC (rev 90586)
+++ trunk/Source/WebCore/platform/graphics/chromium/LayerRendererChromium.cpp 2011-07-07 20:37:44 UTC (rev 90587)
@@ -480,7 +480,7 @@
void LayerRendererChromium::drawLayers(const LayerList& renderSurfaceLayerList)
{
- if (m_viewportVisibleRect.isEmpty())
+ if (m_viewportVisibleRect.isEmpty() || !m_rootLayer)
return;
TRACE_EVENT("LayerRendererChromium::drawLayers", this, 0);
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
