Remove static thread pointers from CC

cc/gl_renderer.h

 // Copyright 2010 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 CCRendererGL_h
 #define CCRendererGL_h
 
 #include "CCCheckerboardDrawQuad.h"
 #include "CCDebugBorderDrawQuad.h"
 #include "CCDirectRenderer.h"
@@ skipping 15 matching lines @@
 class TextureDrawQuad;
 class GeometryBinding;
 class ScopedEnsureFramebufferAllocation;
 
 // Class that handles drawing of composited render layers using GL.
 class GLRenderer : public DirectRenderer,
                      public WebKit::WebGraphicsContext3D::WebGraphicsSwapBuffersCompleteCallbackCHROMIUM,
                      public WebKit::WebGraphicsContext3D::WebGraphicsMemoryAllocationChangedCallbackCHROMIUM ,
                      public WebKit::WebGraphicsContext3D::WebGraphicsContextLostCallback {
 public:
-    static scoped_ptr<GLRenderer> create(RendererClient*, ResourceProvider*);
+    static scoped_ptr<GLRenderer> create(RendererClient*, ResourceProvider*, bool hasImplThread);

[enne (OOO), 2012/10/25 17:28:24]

Could you put hasImplThread in the RendererClient interface instead? That seems
like a better place to put it.

 
     virtual ~GLRenderer();
 
     virtual const RendererCapabilities& capabilities() const OVERRIDE;
 
     WebKit::WebGraphicsContext3D* context();
 
     virtual void viewportChanged() OVERRIDE;
 
     // waits for rendering to finish
     virtual void finish() OVERRIDE;
 
     virtual void doNoOp() OVERRIDE;
     // puts backbuffer onscreen
     virtual bool swapBuffers() OVERRIDE;
 
     virtual void getFramebufferPixels(void *pixels, const IntRect&) OVERRIDE;
 
     virtual bool isContextLost() OVERRIDE;
 
     virtual void setVisible(bool) OVERRIDE;
 
 protected:
-    GLRenderer(RendererClient*, ResourceProvider*);
+    GLRenderer(RendererClient*, ResourceProvider*, bool hasImplThread);
 
     static void debugGLCall(WebKit::WebGraphicsContext3D*, const char* command, const char* file, int line);
 
     bool isFramebufferDiscarded() const { return m_isFramebufferDiscarded; }
     bool initialize();
 
     const FloatQuad& sharedGeometryQuad() const { return m_sharedGeometryQuad; }
     const GeometryBinding* sharedGeometry() const { return m_sharedGeometry.get(); }
 
     bool getFramebufferTexture(ScopedTexture*, const IntRect& deviceRect);
@@ skipping 35 matching lines @@
     bool makeContextCurrent();
 
     bool initializeSharedObjects();
     void cleanupSharedObjects();
 
     // WebKit::WebGraphicsContext3D::WebGraphicsSwapBuffersCompleteCallbackCHROMIUM implementation.
     virtual void onSwapBuffersComplete() OVERRIDE;
 
     // WebKit::WebGraphicsContext3D::WebGraphicsMemoryAllocationChangedCallbackCHROMIUM implementation.
     virtual void onMemoryAllocationChanged(WebKit::WebGraphicsMemoryAllocation) OVERRIDE;
-    void onMemoryAllocationChangedOnImplThread(WebKit::WebGraphicsMemoryAllocation);
     void discardFramebuffer();
     void ensureFramebuffer();
     void enforceMemoryPolicy();
 
     // WebGraphicsContext3D::WebGraphicsContextLostCallback implementation.
     virtual void onContextLost() OVERRIDE;
 
     RendererCapabilities m_capabilities;
 
     unsigned m_offscreenFramebufferId;
@@ skipping 45 matching lines @@
 
     const TextureProgram* textureProgram();
     const TextureProgramFlip* textureProgramFlip();
     const TextureIOSurfaceProgram* textureIOSurfaceProgram();
 
     const VideoYUVProgram* videoYUVProgram();
     const VideoStreamTextureProgram* videoStreamTextureProgram();
 
     const SolidColorProgram* solidColorProgram();
 
+    bool m_hasImplThread;
+
     scoped_ptr<TileProgram> m_tileProgram;
     scoped_ptr<TileProgramOpaque> m_tileProgramOpaque;
     scoped_ptr<TileProgramAA> m_tileProgramAA;
     scoped_ptr<TileProgramSwizzle> m_tileProgramSwizzle;
     scoped_ptr<TileProgramSwizzleOpaque> m_tileProgramSwizzleOpaque;
     scoped_ptr<TileProgramSwizzleAA> m_tileProgramSwizzleAA;
     scoped_ptr<TileCheckerboardProgram> m_tileCheckerboardProgram;
 
     scoped_ptr<RenderPassProgram> m_renderPassProgram;
     scoped_ptr<RenderPassProgramAA> m_renderPassProgramAA;
@@ skipping 32 matching lines @@
 #if DEBUG_GL_CALLS && !defined(NDEBUG)
 #define GLC(context, x) (x, GLRenderer::debugGLCall(&*context, #x, __FILE__, __LINE__))
 #else
 #define GLC(context, x) (x)
 #endif
 
 
 }
 
 #endif