Merge 120858 - [chromium] Separate LayerRenderer initialization from updateLayers

Source/WebCore/platform/graphics/chromium/cc/CCLayerTreeHost.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 281 matching lines @@
 }
 
 // Temporary hack until WebViewImpl context creation gets simplified
 CCGraphicsContext* CCLayerTreeHost::context()
 {
     return m_proxy->context();
 }
 
 bool CCLayerTreeHost::compositeAndReadback(void *pixels, const IntRect& rect)
 {
-    if (!m_layerRendererInitialized) {
-        initializeLayerRenderer();
-        if (!m_layerRendererInitialized)
-            return false;
-    }
-    if (m_contextLost) {
-        if (recreateContext() != RecreateSucceeded)
-            return false;
-    }
     m_triggerIdlePaints = false;
     bool ret = m_proxy->compositeAndReadback(pixels, rect);
     m_triggerIdlePaints = true;
     return ret;
 }
 
 void CCLayerTreeHost::finishAllRendering()
 {
     if (!m_layerRendererInitialized)
         return;
@@ skipping 138 matching lines @@
 {
     ASSERT(!CCThreadProxy::implThread());
     static_cast<CCSingleThreadProxy*>(m_proxy.get())->compositeImmediately();
 }
 
 void CCLayerTreeHost::scheduleComposite()
 {
     m_client->scheduleComposite();
 }
 
-bool CCLayerTreeHost::updateLayers(CCTextureUpdater& updater)
+bool CCLayerTreeHost::initializeLayerRendererIfNeeded()
 {
     if (!m_layerRendererInitialized) {
         initializeLayerRenderer();
         // If we couldn't initialize, then bail since we're returning to software mode.
         if (!m_layerRendererInitialized)
             return false;
     }
     if (m_contextLost) {
         if (recreateContext() != RecreateSucceeded)
             return false;
     }
+    return true;
+}
 
+
+void CCLayerTreeHost::updateLayers(CCTextureUpdater& updater)
+{
+    ASSERT(m_layerRendererInitialized);
     // The visible state and memory allocation are set independently and in
     // arbitrary order, so do not change the memory allocation used for the
     // current commit until both values match intentions.
     // FIXME: These two states should be combined into a single action so we
     // need a single commit to change visible state, and this can be removed.
     bool memoryAllocationStateMatchesVisibility = m_visible == m_memoryAllocationIsForDisplay;
     if (memoryAllocationStateMatchesVisibility) {
         m_contentsTextureManager->setMemoryAllocationLimitBytes(m_memoryAllocationBytes);
         m_frameIsForDisplay = m_memoryAllocationIsForDisplay;
     }
 
     if (!rootLayer())
-        return true;
+        return;
 
     if (viewportSize().isEmpty())
-        return true;
+        return;
 
     updateLayers(rootLayer(), updater);
-    return true;
 }
 
 void CCLayerTreeHost::updateLayers(LayerChromium* rootLayer, CCTextureUpdater& updater)
 {
     TRACE_EVENT("CCLayerTreeHost::updateLayers", this, 0);
 
     if (!rootLayer->renderSurface())
         rootLayer->createRenderSurface();
     rootLayer->renderSurface()->setContentRect(IntRect(IntPoint(0, 0), deviceViewportSize()));
 
@@ skipping 251 matching lines @@
             else
                 layer->notifyAnimationFinished(wallClockTime);
         }
     }
 
     for (size_t childIndex = 0; childIndex < layer->children().size(); ++childIndex)
         setAnimationEventsRecursive(events, layer->children()[childIndex].get(), wallClockTime);
 }
 
 } // namespace WebCore