Title: [126029] branches/chromium/1229/Source/WebCore/platform/graphics/chromium/cc/CCLayerTreeHostImpl.cpp
- Revision
- 126029
- Author
- dan...@chromium.org
- Date
- 2012-08-20 08:09:22 -0700 (Mon, 20 Aug 2012)
Log Message
Merge 125799 - [chromium] Impl scrolling crashes when the renderer's initialization failed
https://bugs.webkit.org/show_bug.cgi?id=94232
Reviewed by James Robinson.
Source/WebCore:
CCLayerTreeHostImpl::calculateRenderSurfaceLayerList should not be
called when there is no renderer present or it will crash.
Chromium bug: crbug.com/125482
Tests: CCLayerTreeHostImplTest.scrollWithoutRenderer
* platform/graphics/chromium/cc/CCLayerTreeHostImpl.cpp:
(WebCore::CCLayerTreeHostImpl::calculateRenderSurfaceLayerList):
(WebCore::CCLayerTreeHostImpl::ensureRenderSurfaceLayerList):
Source/WebKit/chromium:
Also updated the finishAllRenderingAfterContextLost to properly fail
renderer initialization.
* tests/CCLayerTreeHostImplTest.cpp:
TBR=dan...@chromium.org
Review URL: https://chromiumcodereview.appspot.com/10855246
Modified Paths
Diff
Modified: branches/chromium/1229/Source/WebCore/platform/graphics/chromium/cc/CCLayerTreeHostImpl.cpp (126028 => 126029)
--- branches/chromium/1229/Source/WebCore/platform/graphics/chromium/cc/CCLayerTreeHostImpl.cpp 2012-08-20 15:05:09 UTC (rev 126028)
+++ branches/chromium/1229/Source/WebCore/platform/graphics/chromium/cc/CCLayerTreeHostImpl.cpp 2012-08-20 15:09:22 UTC (rev 126029)
@@ -251,6 +251,7 @@
{
ASSERT(renderSurfaceLayerList.isEmpty());
ASSERT(m_rootLayerImpl);
+ ASSERT(m_layerRenderer); // For maxTextureSize.
{
TRACE_EVENT0("cc", "CCLayerTreeHostImpl::calcDrawEtc");
@@ -824,6 +825,8 @@
{
if (!m_rootLayerImpl)
return false;
+ if (!m_layerRenderer)
+ return false;
// We need both a non-empty render surface layer list and a root render
// surface to be able to iterate over the visible layers.
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes
