Revert 171403

cc/single_thread_proxy.cc

 // Copyright 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "cc/single_thread_proxy.h"
 
 #include "base/debug/trace_event.h"
 #include "cc/draw_quad.h"
+#include "cc/graphics_context.h"
 #include "cc/layer_tree_host.h"
-#include "cc/output_surface.h"
 #include "cc/resource_update_controller.h"
 #include "cc/thread.h"
 
 namespace cc {
 
 scoped_ptr<Proxy> SingleThreadProxy::create(LayerTreeHost* layerTreeHost)
 {
     return make_scoped_ptr(new SingleThreadProxy(layerTreeHost)).PassAs<Proxy>();
 }
 
 SingleThreadProxy::SingleThreadProxy(LayerTreeHost* layerTreeHost)
     : Proxy(scoped_ptr<Thread>(NULL))
     , m_layerTreeHost(layerTreeHost)
-    , m_outputSurfaceLost(false)
+    , m_contextLost(false)
     , m_rendererInitialized(false)
     , m_nextFrameIsNewlyCommittedFrame(false)
     , m_totalCommitCount(0)
 {
     TRACE_EVENT0("cc", "SingleThreadProxy::SingleThreadProxy");
     DCHECK(Proxy::isMainThread());
 }
 
 void SingleThreadProxy::start()
 {
@@ skipping 40 matching lines @@
         m_layerTreeHostImpl->finishAllRendering();
     }
 }
 
 bool SingleThreadProxy::isStarted() const
 {
     DCHECK(Proxy::isMainThread());
     return m_layerTreeHostImpl.get();
 }
 
-bool SingleThreadProxy::initializeOutputSurface()
+bool SingleThreadProxy::initializeContext()
 {
     DCHECK(Proxy::isMainThread());
-    scoped_ptr<OutputSurface> outputSurface = m_layerTreeHost->createOutputSurface();
-    if (!outputSurface.get())
+    scoped_ptr<GraphicsContext> context = m_layerTreeHost->createContext();
+    if (!context.get())
         return false;
-    m_outputSurfaceBeforeInitialization = outputSurface.Pass();
+    m_contextBeforeInitialization = context.Pass();
     return true;
 }
 
 void SingleThreadProxy::setSurfaceReady()
 {
     // Scheduling is controlled by the embedder in the single thread case, so nothing to do.
 }
 
 void SingleThreadProxy::setVisible(bool visible)
 {
     DebugScopedSetImplThread impl(this);
     m_layerTreeHostImpl->setVisible(visible);
 }
 
 bool SingleThreadProxy::initializeRenderer()
 {
     DCHECK(Proxy::isMainThread());
-    DCHECK(m_outputSurfaceBeforeInitialization.get());
+    DCHECK(m_contextBeforeInitialization.get());
     {
         DebugScopedSetImplThread impl(this);
-        bool ok = m_layerTreeHostImpl->initializeRenderer(m_outputSurfaceBeforeInitialization.Pass());
+        bool ok = m_layerTreeHostImpl->initializeRenderer(m_contextBeforeInitialization.Pass());
         if (ok) {
             m_rendererInitialized = true;
             m_RendererCapabilitiesForMainThread = m_layerTreeHostImpl->rendererCapabilities();
         }
 
         return ok;
     }
 }
 
-bool SingleThreadProxy::recreateOutputSurface()
+bool SingleThreadProxy::recreateContext()
 {
     TRACE_EVENT0("cc", "SingleThreadProxy::recreateContext");
     DCHECK(Proxy::isMainThread());
-    DCHECK(m_outputSurfaceLost);
+    DCHECK(m_contextLost);
 
-    scoped_ptr<OutputSurface> outputSurface = m_layerTreeHost->createOutputSurface();
-    if (!outputSurface.get())
+    scoped_ptr<GraphicsContext> context = m_layerTreeHost->createContext();
+    if (!context.get())
         return false;
 
     bool initialized;
     {
         DebugScopedSetMainThreadBlocked mainThreadBlocked(this);
         DebugScopedSetImplThread impl(this);
         if (!m_layerTreeHostImpl->contentsTexturesPurged())
             m_layerTreeHost->deleteContentsTexturesOnImplThread(m_layerTreeHostImpl->resourceProvider());
-        initialized = m_layerTreeHostImpl->initializeRenderer(outputSurface.Pass());
+        initialized = m_layerTreeHostImpl->initializeRenderer(context.Pass());
         if (initialized) {
             m_RendererCapabilitiesForMainThread = m_layerTreeHostImpl->rendererCapabilities();
         }
     }
 
     if (initialized)
-        m_outputSurfaceLost = false;
+        m_contextLost = false;
 
     return initialized;
 }
 
 void SingleThreadProxy::renderingStats(RenderingStats* stats)
 {
     stats->totalCommitTimeInSeconds = m_totalCommitTime.InSecondsF();
     stats->totalCommitCount = m_totalCommitCount;
     m_layerTreeHostImpl->renderingStats(stats);
 }
 
 const RendererCapabilities& SingleThreadProxy::rendererCapabilities() const
 {
     DCHECK(m_rendererInitialized);
     // Note: this gets called during the commit by the "impl" thread
     return m_RendererCapabilitiesForMainThread;
 }
 
-void SingleThreadProxy::loseOutputSurface()
+void SingleThreadProxy::loseContext()
 {
     DCHECK(Proxy::isMainThread());
-    m_layerTreeHost->didLoseOutputSurface();
-    m_outputSurfaceLost = true;
+    m_layerTreeHost->didLoseContext();
+    m_contextLost = true;
 }
 
 void SingleThreadProxy::setNeedsAnimate()
 {
     // Thread-only feature
     NOTREACHED();
 }
 
 void SingleThreadProxy::doCommit(scoped_ptr<ResourceUpdateQueue> queue)
 {
@@ skipping 173 matching lines @@
 
     m_layerTreeHost->willCommit();
     doCommit(queue.Pass());
     bool result = doComposite();
     m_layerTreeHost->didBeginFrame();
     return result;
 }
 
 bool SingleThreadProxy::doComposite()
 {
-    DCHECK(!m_outputSurfaceLost);
+    DCHECK(!m_contextLost);
     {
         DebugScopedSetImplThread impl(this);
 
         if (!m_layerTreeHostImpl->visible())
             return false;
 
         m_layerTreeHostImpl->animate(base::TimeTicks::Now(), base::Time::Now());
 
         if (m_layerTreeHostImpl->settings().implSidePainting)
           m_layerTreeHostImpl->manageTiles();
 
         // We guard prepareToDraw() with canDraw() because it always returns a valid frame, so can only
         // be used when such a frame is possible. Since drawLayers() depends on the result of
         // prepareToDraw(), it is guarded on canDraw() as well.
         if (!m_layerTreeHostImpl->canDraw())
             return false;
 
         LayerTreeHostImpl::FrameData frame;
         m_layerTreeHostImpl->prepareToDraw(frame);
         m_layerTreeHostImpl->drawLayers(frame);
         m_layerTreeHostImpl->didDrawAllLayers(frame);
     }
 
     if (m_layerTreeHostImpl->isContextLost()) {
-        m_outputSurfaceLost = true;
-        m_layerTreeHost->didLoseOutputSurface();
+        m_contextLost = true;
+        m_layerTreeHost->didLoseContext();
         return false;
     }
 
     return true;
 }
 
 void SingleThreadProxy::didSwapFrame()
 {
     if (m_nextFrameIsNewlyCommittedFrame) {
         m_nextFrameIsNewlyCommittedFrame = false;
         m_layerTreeHost->didCommitAndDrawFrame();
     }
 }
 
 }  // namespace cc