Remove static thread pointers from CC

cc/proxy.h

 // 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.
 
 #ifndef CCProxy_h
 #define CCProxy_h
 
 #include "base/basictypes.h"
 #include "base/logging.h"
 #include "base/time.h"
+#include "base/memory/scoped_ptr.h"
 #include <public/WebCompositorOutputSurface.h>
 
 namespace gfx {
 class Rect;
 }
 
 namespace cc {
 
 class Thread;
 class IntSize;
 struct RenderingStats;
 struct RendererCapabilities;
 
 // Abstract class responsible for proxying commands from the main-thread side of
 // the compositor over to the compositor implementation.
 class Proxy {
 public:
-    static void setMainThread(Thread*);
-    static Thread* mainThread();
-
-    static bool hasImplThread();
-    static void setImplThread(Thread*);
-    static Thread* implThread();
+    Thread* mainThread() const;
+    bool hasImplThread() const;
+    Thread* implThread() const;
 
     // Returns 0 if the current thread is neither the main thread nor the impl thread.
-    static Thread* currentThread();
+    Thread* currentThread() const;
+
+    // Debug hooks
+    bool isMainThread() const;
+    bool isImplThread() const;
+    bool isMainThreadBlocked() const;
+#ifndef NDEBUG
+    void setMainThreadBlocked(bool);
+    void setCurrentThreadIsImplThread(bool);
+#endif
 
     virtual ~Proxy();
 
     virtual bool compositeAndReadback(void *pixels, const gfx::Rect&) = 0;
 
     virtual void startPageScaleAnimation(const IntSize& targetPosition, bool useAnchor, float scale, base::TimeDelta duration) = 0;
 
     virtual void finishAllRendering() = 0;
 
     virtual bool isStarted() const = 0;
@@ skipping 35 matching lines @@
 
     // Forces 3D commands on all contexts to wait for all previous SwapBuffers to finish before executing in the GPU
     // process.
     virtual void forceSerializeOnSwapBuffers() = 0;
 
     // Maximum number of sub-region texture updates supported for each commit.
     virtual size_t maxPartialTextureUpdates() const = 0;
 
     virtual void acquireLayerTextures() = 0;
 
-    // Debug hooks
-    static bool isMainThread();
-    static bool isImplThread();
-    static bool isMainThreadBlocked();
-#ifndef NDEBUG
-    static void setMainThreadBlocked(bool);
-#endif
-
     // Testing hooks
     virtual void loseContext() = 0;
 
-#ifndef NDEBUG
-    static void setCurrentThreadIsImplThread(bool);
-#endif
-
 protected:
-    Proxy();
+    explicit Proxy(scoped_ptr<Thread> implThread);
     friend class DebugScopedSetImplThread;
+    friend class DebugScopedSetMainThread;
     friend class DebugScopedSetMainThreadBlocked;
 
 private:
     DISALLOW_COPY_AND_ASSIGN(Proxy);
+
+    scoped_ptr<Thread> m_mainThread;
+    scoped_ptr<Thread> m_implThread;
+#ifndef NDEBUG
+    bool m_implThreadIsOverridden;
+    bool m_isMainThreadBlocked;
+#endif
 };
 
 class DebugScopedSetMainThreadBlocked {
 public:
-    DebugScopedSetMainThreadBlocked()
+    explicit DebugScopedSetMainThreadBlocked(Proxy* proxy)
+        : m_proxy(proxy)
     {
 #ifndef NDEBUG
-        DCHECK(!Proxy::isMainThreadBlocked());
-        Proxy::setMainThreadBlocked(true);
+        DCHECK(!m_proxy->isMainThreadBlocked());
+        m_proxy->setMainThreadBlocked(true);
 #endif
     }
     ~DebugScopedSetMainThreadBlocked()
     {
 #ifndef NDEBUG
-        DCHECK(Proxy::isMainThreadBlocked());
-        Proxy::setMainThreadBlocked(false);
+        DCHECK(m_proxy->isMainThreadBlocked());
+        m_proxy->setMainThreadBlocked(false);
 #endif
     }
+private:
+    Proxy* m_proxy;
 };
 
 }
 
 #endif