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/memory/scoped_ptr.h"
 #include <public/WebCompositorOutputSurface.h>
+#include <public/WebThread.h>

[jamesr, 2012/10/22 22:00:36]

again, not great :( cc::CCThread?

 
 namespace cc {
 
 class CCThread;
 class IntRect;
 class IntSize;
 struct CCRenderingStats;
 struct RendererCapabilities;
 
 // Abstract class responsible for proxying commands from the main-thread side of
 // the compositor over to the compositor implementation.
 class CCProxy {
 public:
-    static void setMainThread(CCThread*);
-    static CCThread* mainThread();
-
-    static bool hasImplThread();
-    static void setImplThread(CCThread*);
-    static CCThread* implThread();
+    CCThread* mainThread() const;
+    bool hasImplThread() const;
+    CCThread* implThread() const;
 
     // Returns 0 if the current thread is neither the main thread nor the impl thread.
-    static CCThread* currentThread();
+    CCThread* currentThread() const;
+
+    // Debug hooks
+    bool isMainThread() const;
+    bool isImplThread() const;
+    bool isMainThreadBlocked() const;
+    void setMainThread(CCThread*);
+    void setImplThread(CCThread*);
+#ifndef NDEBUG
+    void setMainThreadBlocked(bool);
+    void setCurrentThreadIsImplThread(bool);
+#endif
+
 
     virtual ~CCProxy();
 
     virtual bool compositeAndReadback(void *pixels, const IntRect&) = 0;
 
     virtual void startPageScaleAnimation(const IntSize& targetPosition, bool useAnchor, float scale, double durationSec) = 0;
 
     virtual void finishAllRendering() = 0;
 
     virtual bool isStarted() const = 0;
@@ skipping 31 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:
-    CCProxy();
+    explicit CCProxy(WebKit::WebThread* implThread);
     friend class DebugScopedSetImplThread;
     friend class DebugScopedSetMainThreadBlocked;
 
 private:
     DISALLOW_COPY_AND_ASSIGN(CCProxy);
+
+    CompositorSupportState* m_compositorSupportState;
+#ifndef NDEBUG
+    bool m_implThreadIsOverridden;
+    bool m_isMainThreadBlocked;
+    base::PlatformThreadId m_threadIDOverridenToBeImplThread;
+#endif
 };
 
 class DebugScopedSetMainThreadBlocked {
 public:
     DebugScopedSetMainThreadBlocked()
     {
 #ifndef NDEBUG
         DCHECK(!CCProxy::isMainThreadBlocked());
         CCProxy::setMainThreadBlocked(true);
 #endif
     }
     ~DebugScopedSetMainThreadBlocked()
     {
 #ifndef NDEBUG
         DCHECK(CCProxy::isMainThreadBlocked());
         CCProxy::setMainThreadBlocked(false);
 #endif
     }
 };
 
 }
 
 #endif