Merge 120858 - [chromium] Separate LayerRenderer initialization from updateLayers

Source/WebCore/platform/graphics/chromium/cc/CCSingleThreadProxy.cpp

 /*
  * Copyright (C) 2011 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1.  Redistributions of source code must retain the above copyright
  *     notice, this list of conditions and the following disclaimer.
  * 2.  Redistributions in binary form must reproduce the above copyright
  *     notice, this list of conditions and the following disclaimer in the
@@ skipping 326 matching lines @@
         DebugScopedSetImplThread impl;
         if (m_layerRendererInitialized)
             m_layerTreeHostImpl->layerRenderer()->doNoOp();
     }
 }
 
 bool CCSingleThreadProxy::commitAndComposite()
 {
     ASSERT(CCProxy::isMainThread());
 
+    if (!m_layerTreeHost->initializeLayerRendererIfNeeded())
+        return false;
+
     CCTextureUpdater updater;
-
-    if (!m_layerTreeHost->updateLayers(updater))
-        return false;
+    m_layerTreeHost->updateLayers(updater);
 
     m_layerTreeHost->willCommit();
     doCommit(updater);
     bool result = doComposite();
     m_layerTreeHost->didBeginFrame();
     return result;
 }
 
 bool CCSingleThreadProxy::doComposite()
 {
@@ skipping 31 matching lines @@
 
 void CCSingleThreadProxy::didSwapFrame()
 {
     if (m_nextFrameIsNewlyCommittedFrame) {
         m_nextFrameIsNewlyCommittedFrame = false;
         m_layerTreeHost->didCommitAndDrawFrame();
     }
 }
 
 }