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

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

Issue 10702135: Merge 120858 - [chromium] Separate LayerRenderer initialization from updateLayers (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1180/
Patch Set: Created 8 years, 5 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/CCSingleThreadProxy.cpp
===================================================================
--- Source/WebCore/platform/graphics/chromium/cc/CCSingleThreadProxy.cpp (revision 122256)
+++ Source/WebCore/platform/graphics/chromium/cc/CCSingleThreadProxy.cpp (working copy)
@@ -344,11 +344,12 @@
{
ASSERT(CCProxy::isMainThread());
+ if (!m_layerTreeHost->initializeLayerRendererIfNeeded())
+ return false;
+
CCTextureUpdater updater;
+ m_layerTreeHost->updateLayers(updater);
- if (!m_layerTreeHost->updateLayers(updater))
- return false;
-
m_layerTreeHost->willCommit();
doCommit(updater);
bool result = doComposite();

Powered by Google App Engine
This is Rietveld 408576698