cc: Unify context losing machinery

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/layer_tree_host.h"
 #include "cc/output_surface.h"
@@ skipping 33 matching lines @@
 }
 
 bool SingleThreadProxy::compositeAndReadback(void *pixels, const gfx::Rect& rect)
 {
     TRACE_EVENT0("cc", "SingleThreadProxy::compositeAndReadback");
     DCHECK(Proxy::isMainThread());
 
     if (!commitAndComposite())
         return false;
 
-    m_layerTreeHostImpl->readback(pixels, rect);
+    {
+        DebugScopedSetImplThread impl(this);
+        m_layerTreeHostImpl->readback(pixels, rect);
 
-    if (m_layerTreeHostImpl->isContextLost())
-        return false;
+        if (m_layerTreeHostImpl->isContextLost())
+            return false;
 
-    m_layerTreeHostImpl->swapBuffers();
+        m_layerTreeHostImpl->swapBuffers();
+    }
     didSwapFrame();
 
     return true;
 }
 
 void SingleThreadProxy::startPageScaleAnimation(gfx::Vector2d targetOffset, bool useAnchor, float scale, base::TimeDelta duration)
 {
     m_layerTreeHostImpl->startPageScaleAnimation(targetOffset, useAnchor, scale, base::TimeTicks::Now(), duration);
 }
 
@@ skipping 87 matching lines @@
 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()
 {
     DCHECK(Proxy::isMainThread());
-    m_layerTreeHost->didLoseOutputSurface();
-    m_outputSurfaceLost = true;
+
+    DebugScopedSetImplThread impl(this);
+    m_layerTreeHostImpl->resourceProvider()->loseOutputSurface();
 }
 
 void SingleThreadProxy::setNeedsAnimate()
 {
     // Thread-only feature
     NOTREACHED();
 }
 
 void SingleThreadProxy::doCommit(scoped_ptr<ResourceUpdateQueue> queue)
 {
@@ skipping 124 matching lines @@
         return;
     if (!m_layerTreeHost->contentsTextureManager())
         return;
 
     m_layerTreeHostImpl->sendManagedMemoryStats(
         m_layerTreeHost->contentsTextureManager()->memoryVisibleBytes(),
         m_layerTreeHost->contentsTextureManager()->memoryVisibleAndNearbyBytes(),
         m_layerTreeHost->contentsTextureManager()->memoryUseBytes());
 }
 
+void SingleThreadProxy::didLoseOutputSurfaceOnImplThread()
+{
+    // Cause a commit so we can notice the lost context.
+    setNeedsCommitOnImplThread();
+}
+
 // Called by the legacy scheduling path (e.g. where render_widget does the scheduling)
 void SingleThreadProxy::compositeImmediately()
 {
     if (commitAndComposite()) {
         m_layerTreeHostImpl->swapBuffers();
         didSwapFrame();
     }
 }
 
 void SingleThreadProxy::forceSerializeOnSwapBuffers()
@@ skipping 49 matching lines @@
         // 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);
+        m_outputSurfaceLost = m_layerTreeHostImpl->isContextLost();
     }
 
-    if (m_layerTreeHostImpl->isContextLost()) {
-        m_outputSurfaceLost = true;
+    if (m_outputSurfaceLost) {
         m_layerTreeHost->didLoseOutputSurface();
         return false;
     }
 
     return true;
 }
 
 void SingleThreadProxy::didSwapFrame()
 {
     if (m_nextFrameIsNewlyCommittedFrame) {
         m_nextFrameIsNewlyCommittedFrame = false;
         m_layerTreeHost->didCommitAndDrawFrame();
     }
 }
 
 bool SingleThreadProxy::commitPendingForTesting()
 {
     return false;
 }
 
 }  // namespace cc