Title: [111968] trunk/Source/WebCore
- Revision
- 111968
- Author
- [email protected]
- Date
- 2012-03-23 19:15:59 -0700 (Fri, 23 Mar 2012)
Log Message
[chromium] RootLayer was not being checked for null causing segfaults very rarely.
https://bugs.webkit.org/show_bug.cgi?id=82111
Patch by Michal Mocny <[email protected]> on 2012-03-23
Reviewed by Adrienne Walker.
* platform/graphics/chromium/LayerRendererChromium.cpp:
(WebCore::LayerRendererChromium::beginDrawingFrame):
* platform/graphics/chromium/cc/CCLayerTreeHostImpl.cpp:
(WebCore::CCLayerTreeHostImpl::drawLayers):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (111967 => 111968)
--- trunk/Source/WebCore/ChangeLog 2012-03-24 02:13:24 UTC (rev 111967)
+++ trunk/Source/WebCore/ChangeLog 2012-03-24 02:15:59 UTC (rev 111968)
@@ -1,3 +1,15 @@
+2012-03-23 Michal Mocny <[email protected]>
+
+ [chromium] RootLayer was not being checked for null causing segfaults very rarely.
+ https://bugs.webkit.org/show_bug.cgi?id=82111
+
+ Reviewed by Adrienne Walker.
+
+ * platform/graphics/chromium/LayerRendererChromium.cpp:
+ (WebCore::LayerRendererChromium::beginDrawingFrame):
+ * platform/graphics/chromium/cc/CCLayerTreeHostImpl.cpp:
+ (WebCore::CCLayerTreeHostImpl::drawLayers):
+
2012-03-23 Shawn Singh <[email protected]>
[chromium] Fix race bug that clobbers CCLayerImpl updateRect
Modified: trunk/Source/WebCore/platform/graphics/chromium/LayerRendererChromium.cpp (111967 => 111968)
--- trunk/Source/WebCore/platform/graphics/chromium/LayerRendererChromium.cpp 2012-03-24 02:13:24 UTC (rev 111967)
+++ trunk/Source/WebCore/platform/graphics/chromium/LayerRendererChromium.cpp 2012-03-24 02:15:59 UTC (rev 111968)
@@ -404,6 +404,7 @@
void LayerRendererChromium::beginDrawingFrame()
{
+ ASSERT(rootLayer());
m_defaultRenderSurface = rootLayer()->renderSurface();
// FIXME: use the frame begin time from the overall compositor scheduler.
Modified: trunk/Source/WebCore/platform/graphics/chromium/cc/CCLayerTreeHostImpl.cpp (111967 => 111968)
--- trunk/Source/WebCore/platform/graphics/chromium/cc/CCLayerTreeHostImpl.cpp 2012-03-24 02:13:24 UTC (rev 111967)
+++ trunk/Source/WebCore/platform/graphics/chromium/cc/CCLayerTreeHostImpl.cpp 2012-03-24 02:15:59 UTC (rev 111968)
@@ -379,6 +379,9 @@
TRACE_EVENT("CCLayerTreeHostImpl::drawLayers", this, 0);
ASSERT(m_layerRenderer);
+ if (!rootLayer())
+ return;
+
m_layerRenderer->beginDrawingFrame();
for (size_t i = 0; i < frame.renderPasses.size(); ++i)
m_layerRenderer->drawRenderPass(frame.renderPasses[i].get());
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
