Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(231)

Unified Diff: Source/WebCore/platform/graphics/chromium/cc/CCLayerTreeHostImpl.cpp

Issue 10829399: Merge 125799 - [chromium] Impl scrolling crashes when the renderer's initialization failed (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1229/
Patch Set: Created 8 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: Source/WebCore/platform/graphics/chromium/cc/CCLayerTreeHostImpl.cpp
===================================================================
--- Source/WebCore/platform/graphics/chromium/cc/CCLayerTreeHostImpl.cpp (revision 125940)
+++ Source/WebCore/platform/graphics/chromium/cc/CCLayerTreeHostImpl.cpp (working copy)
@@ -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.

Powered by Google App Engine
This is Rietveld 408576698