Title: [93576] branches/chromium/835/Source/WebCore
- Revision
- 93576
- Author
- [email protected]
- Date
- 2011-08-22 19:53:09 -0700 (Mon, 22 Aug 2011)
Log Message
Chromium crash fix, just for this branch.
BUG=93824
* platform/graphics/chromium/LayerRendererChromium.cpp:
(WebCore::LayerRendererChromium::paintLayerContents):
Modified Paths
Diff
Modified: branches/chromium/835/Source/WebCore/ChangeLog (93575 => 93576)
--- branches/chromium/835/Source/WebCore/ChangeLog 2011-08-23 02:15:22 UTC (rev 93575)
+++ branches/chromium/835/Source/WebCore/ChangeLog 2011-08-23 02:53:09 UTC (rev 93576)
@@ -1,3 +1,12 @@
+2011-08-22 James Robinson <[email protected]>
+
+ Chromium crash fix, just for this branch.
+
+ BUG=93824
+
+ * platform/graphics/chromium/LayerRendererChromium.cpp:
+ (WebCore::LayerRendererChromium::paintLayerContents):
+
2011-08-03 Adam Barth <[email protected]>
Crash in DocumentWriter::endIfNotLoadingMainResource
Modified: branches/chromium/835/Source/WebCore/platform/graphics/chromium/LayerRendererChromium.cpp (93575 => 93576)
--- branches/chromium/835/Source/WebCore/platform/graphics/chromium/LayerRendererChromium.cpp 2011-08-23 02:15:22 UTC (rev 93575)
+++ branches/chromium/835/Source/WebCore/platform/graphics/chromium/LayerRendererChromium.cpp 2011-08-23 02:53:09 UTC (rev 93576)
@@ -447,6 +447,10 @@
continue;
LayerChromium* layer = ccLayerImpl->owner();
+ // Our layer may be destroyed as a side effect of painting another layer. In that case, abort this paint operation.
+ // Since the compositing tree has changed we will either produce a new frame or exit compositing completely.
+ if (!layer)
+ return;
layer->setLayerRenderer(this);
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
