A speculative Revert for r165872 - Remove static thread pointers from CC, attempt 2

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 "config.h"
 
 #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/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_layerTreeHost(layerTreeHost)
     , m_contextLost(false)
     , m_rendererInitialized(false)
     , m_nextFrameIsNewlyCommittedFrame(false)
     , m_totalCommitCount(0)
 {
     TRACE_EVENT0("cc", "SingleThreadProxy::SingleThreadProxy");
     DCHECK(Proxy::isMainThread());
 }
 
 void SingleThreadProxy::start()
 {
-    DebugScopedSetImplThread impl(this);
+    DebugScopedSetImplThread impl;
     m_layerTreeHostImpl = m_layerTreeHost->createLayerTreeHostImpl(this);
 }
 
 SingleThreadProxy::~SingleThreadProxy()
 {
     TRACE_EVENT0("cc", "SingleThreadProxy::~SingleThreadProxy");
     DCHECK(Proxy::isMainThread());
     DCHECK(!m_layerTreeHostImpl.get() && !m_layerTreeHost); // make sure stop() got called.
 }
 
@@ skipping 18 matching lines @@
 
 void SingleThreadProxy::startPageScaleAnimation(const IntSize& targetPosition, bool useAnchor, float scale, base::TimeDelta duration)
 {
     m_layerTreeHostImpl->startPageScaleAnimation(targetPosition, useAnchor, scale, base::TimeTicks::Now(), duration);
 }
 
 void SingleThreadProxy::finishAllRendering()
 {
     DCHECK(Proxy::isMainThread());
     {
-        DebugScopedSetImplThread impl(this);
+        DebugScopedSetImplThread impl;
         m_layerTreeHostImpl->finishAllRendering();
     }
 }
 
 bool SingleThreadProxy::isStarted() const
 {
     DCHECK(Proxy::isMainThread());
     return m_layerTreeHostImpl.get();
 }
 
 bool SingleThreadProxy::initializeContext()
 {
     DCHECK(Proxy::isMainThread());
     scoped_ptr<GraphicsContext> context = m_layerTreeHost->createContext();
     if (!context.get())
         return false;
     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);
+    DebugScopedSetImplThread impl;
     m_layerTreeHostImpl->setVisible(visible);
 }
 
 bool SingleThreadProxy::initializeRenderer()
 {
     DCHECK(Proxy::isMainThread());
     DCHECK(m_contextBeforeInitialization.get());
     {
-        DebugScopedSetImplThread impl(this);
+        DebugScopedSetImplThread impl;
         bool ok = m_layerTreeHostImpl->initializeRenderer(m_contextBeforeInitialization.Pass());
         if (ok) {
             m_rendererInitialized = true;
             m_RendererCapabilitiesForMainThread = m_layerTreeHostImpl->rendererCapabilities();
         }
 
         return ok;
     }
 }
 
 bool SingleThreadProxy::recreateContext()
 {
     TRACE_EVENT0("cc", "SingleThreadProxy::recreateContext");
     DCHECK(Proxy::isMainThread());
     DCHECK(m_contextLost);
 
     scoped_ptr<GraphicsContext> context = m_layerTreeHost->createContext();
     if (!context.get())
         return false;
 
     bool initialized;
     {
-        DebugScopedSetMainThreadBlocked mainThreadBlocked(this);
-        DebugScopedSetImplThread impl(this);
+        DebugScopedSetMainThreadBlocked mainThreadBlocked;
+        DebugScopedSetImplThread impl;
         if (!m_layerTreeHostImpl->contentsTexturesPurged())
             m_layerTreeHost->deleteContentsTexturesOnImplThread(m_layerTreeHostImpl->resourceProvider());
         initialized = m_layerTreeHostImpl->initializeRenderer(context.Pass());
         if (initialized) {
             m_RendererCapabilitiesForMainThread = m_layerTreeHostImpl->rendererCapabilities();
         }
     }
 
     if (initialized)
         m_contextLost = false;
@@ skipping 26 matching lines @@
 {
     // Thread-only feature
     NOTREACHED();
 }
 
 void SingleThreadProxy::doCommit(scoped_ptr<ResourceUpdateQueue> queue)
 {
     DCHECK(Proxy::isMainThread());
     // Commit immediately
     {
-        DebugScopedSetMainThreadBlocked mainThreadBlocked(this);
-        DebugScopedSetImplThread impl(this);
+        DebugScopedSetMainThreadBlocked mainThreadBlocked;
+        DebugScopedSetImplThread impl;
 
         base::TimeTicks startTime = base::TimeTicks::HighResNow();
         m_layerTreeHostImpl->beginCommit();
 
         m_layerTreeHost->contentsTextureManager()->pushTexturePrioritiesToBackings();
         m_layerTreeHost->beginCommitOnImplThread(m_layerTreeHostImpl.get());
 
         scoped_ptr<ResourceUpdateController> updateController =
             ResourceUpdateController::create(
                 NULL,
                 Proxy::mainThread(),
                 queue.Pass(),
-                m_layerTreeHostImpl->resourceProvider(),
-                hasImplThread());
+                m_layerTreeHostImpl->resourceProvider());
         updateController->finalize();
 
         m_layerTreeHost->finishCommitOnImplThread(m_layerTreeHostImpl.get());
 
         m_layerTreeHostImpl->commitComplete();
 
 #ifndef NDEBUG
         // In the single-threaded case, the scroll deltas should never be
         // touched on the impl layer tree.
         scoped_ptr<ScrollAndScaleSet> scrollInfo = m_layerTreeHostImpl->processScrollDeltas();
@@ skipping 40 matching lines @@
 size_t SingleThreadProxy::maxPartialTextureUpdates() const
 {
     return std::numeric_limits<size_t>::max();
 }
 
 void SingleThreadProxy::stop()
 {
     TRACE_EVENT0("cc", "SingleThreadProxy::stop");
     DCHECK(Proxy::isMainThread());
     {
-        DebugScopedSetMainThreadBlocked mainThreadBlocked(this);
-        DebugScopedSetImplThread impl(this);
+        DebugScopedSetMainThreadBlocked mainThreadBlocked;
+        DebugScopedSetImplThread impl;
 
         if (!m_layerTreeHostImpl->contentsTexturesPurged())
             m_layerTreeHost->deleteContentsTexturesOnImplThread(m_layerTreeHostImpl->resourceProvider());
         m_layerTreeHostImpl.reset();
     }
     m_layerTreeHost = 0;
 }
 
 void SingleThreadProxy::setNeedsRedrawOnImplThread()
 {
     m_layerTreeHost->scheduleComposite();
 }
 
 void SingleThreadProxy::setNeedsCommitOnImplThread()
 {
     m_layerTreeHost->scheduleComposite();
 }
 
 void SingleThreadProxy::postAnimationEventsToMainThreadOnImplThread(scoped_ptr<AnimationEventsVector> events, base::Time wallClockTime)
 {
     DCHECK(Proxy::isImplThread());
-    DebugScopedSetMainThread main(this);
+    DebugScopedSetMainThread main;
     m_layerTreeHost->setAnimationEvents(events.Pass(), wallClockTime);
 }
 
 bool SingleThreadProxy::reduceContentsTextureMemoryOnImplThread(size_t limitBytes, int priorityCutoff)
 {
     DCHECK(isImplThread());
     if (!m_layerTreeHost->contentsTextureManager())
         return false;
 
     return m_layerTreeHost->contentsTextureManager()->reduceMemoryOnImplThread(limitBytes, priorityCutoff, m_layerTreeHostImpl->resourceProvider());
@@ skipping 20 matching lines @@
 {
     if (commitAndComposite()) {
         m_layerTreeHostImpl->swapBuffers();
         didSwapFrame();
     }
 }
 
 void SingleThreadProxy::forceSerializeOnSwapBuffers()
 {
     {
-        DebugScopedSetImplThread impl(this);
+        DebugScopedSetImplThread impl;
         if (m_rendererInitialized)
             m_layerTreeHostImpl->renderer()->doNoOp();
     }
 }
 
 void SingleThreadProxy::onSwapBuffersCompleteOnImplThread()
 {
     NOTREACHED();
 }
 
 bool SingleThreadProxy::commitAndComposite()
 {
     DCHECK(Proxy::isMainThread());
 
     if (!m_layerTreeHost->initializeRendererIfNeeded())
         return false;
 
     // Unlink any texture backings that were deleted
     PrioritizedTextureManager::BackingList evictedContentsTexturesBackings;
     {
-        DebugScopedSetImplThread impl(this);
+        DebugScopedSetImplThread implThread;
         m_layerTreeHost->contentsTextureManager()->getEvictedBackings(evictedContentsTexturesBackings);
     }
     m_layerTreeHost->contentsTextureManager()->unlinkEvictedBackings(evictedContentsTexturesBackings);
 
     scoped_ptr<ResourceUpdateQueue> queue = make_scoped_ptr(new ResourceUpdateQueue);
     m_layerTreeHost->updateLayers(*(queue.get()), m_layerTreeHostImpl->memoryAllocationLimitBytes());
 
     if (m_layerTreeHostImpl->contentsTexturesPurged())
         m_layerTreeHostImpl->resetContentsTexturesPurged();
 
     m_layerTreeHost->willCommit();
     doCommit(queue.Pass());
     bool result = doComposite();
     m_layerTreeHost->didBeginFrame();
     return result;
 }
 
 bool SingleThreadProxy::doComposite()
 {
     DCHECK(!m_contextLost);
     {
-        DebugScopedSetImplThread impl(this);
+        DebugScopedSetImplThread impl;
 
         if (!m_layerTreeHostImpl->visible())
             return false;
 
         m_layerTreeHostImpl->animate(base::TimeTicks::Now(), base::Time::Now());
 
         // 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())
@@ skipping 16 matching lines @@
 
 void SingleThreadProxy::didSwapFrame()
 {
     if (m_nextFrameIsNewlyCommittedFrame) {
         m_nextFrameIsNewlyCommittedFrame = false;
         m_layerTreeHost->didCommitAndDrawFrame();
     }
 }
 
 }