Remove static thread pointers from CC

cc/layer_tree_host.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 CC_LAYER_TREE_HOST_H_
 #define CC_LAYER_TREE_HOST_H_
 
 #include <limits>
 
 #include "base/basictypes.h"
@@ skipping 56 matching lines @@
     size_t maxPartialTextureUpdates;
     gfx::Size defaultTileSize;
     gfx::Size maxUntiledLayerSize;
     gfx::Size minimumOcclusionTrackingSize;
 
     bool showDebugInfo() const { return showPlatformLayerTree || showDebugRects(); }
     bool showDebugRects() const { return showPaintRects || showPropertyChangedRects || showSurfaceDamageRects || showScreenSpaceRects || showReplicaScreenSpaceRects || showOccludingRects; }
 };
 
 // Provides information on an Impl's rendering capabilities back to the LayerTreeHost
-struct RendererCapabilities {
+struct CC_EXPORT RendererCapabilities {
     RendererCapabilities();
     ~RendererCapabilities();
 
     GLenum bestTextureFormat;
     bool contextHasCachedFrontBuffer;
     bool usingPartialSwap;
     bool usingAcceleratedPainting;
     bool usingSetVisibility;
     bool usingSwapCompleteCallback;
     bool usingGpuMemoryManager;
     bool usingDiscardFramebuffer;
     bool usingEglImage;
     int maxTextureSize;
 };
 
 class CC_EXPORT LayerTreeHost : public RateLimiterClient {
 public:
-    static scoped_ptr<LayerTreeHost> create(LayerTreeHostClient*, const LayerTreeSettings&);
+    static scoped_ptr<LayerTreeHost> create(LayerTreeHostClient*, const LayerTreeSettings&, scoped_ptr<Thread> implThread);
     virtual ~LayerTreeHost();
 
     void setSurfaceReady();
 
     // Returns true if any LayerTreeHost is alive.
     static bool anyLayerTreeHostInstanceExists();
 
     static bool needsFilterContext() { return s_needsFilterContext; }
     static void setNeedsFilterContext(bool needsFilterContext) { s_needsFilterContext = needsFilterContext; }
     bool needsSharedContext() const { return needsFilterContext() || settings().acceleratePainting; }
@@ skipping 20 matching lines @@
     void didCommitAndDrawFrame() { m_client->didCommitAndDrawFrame(); }
     void didCompleteSwapBuffers() { m_client->didCompleteSwapBuffers(); }
     void deleteContentsTexturesOnImplThread(ResourceProvider*);
     virtual void acquireLayerTextures();
     // Returns false if we should abort this frame due to initialization failure.
     bool initializeRendererIfNeeded();
     void updateLayers(ResourceUpdateQueue&, size_t contentsMemoryLimitBytes);
 
     LayerTreeHostClient* client() { return m_client; }
 
+    void composite();
+
     // Only used when compositing on the main thread.
-    void composite();
     void scheduleComposite();
 
     // Composites and attempts to read back the result into the provided
     // buffer. If it wasn't possible, e.g. due to context lost, will return
     // false.
     bool compositeAndReadback(void *pixels, const gfx::Rect&);
 
     void finishAllRendering();
 
     void setDeferCommits(bool deferCommits);
@@ skipping 57 matching lines @@
     bool requestPartialTextureUpdate();
 
     void setDeviceScaleFactor(float);
     float deviceScaleFactor() const { return m_deviceScaleFactor; }
 
     void setShowFPSCounter(bool show);
     void setFontAtlas(scoped_ptr<FontAtlas>);
 
     HeadsUpDisplayLayer* hudLayer() const { return m_hudLayer.get(); }
 
+    Proxy* proxy() const { return m_proxy.get(); }
+
 protected:
     LayerTreeHost(LayerTreeHostClient*, const LayerTreeSettings&);
-    bool initialize();
+    bool initialize(scoped_ptr<Thread> implThread);
 
 private:
     typedef std::vector<scoped_refptr<Layer> > LayerList;
 
     void initializeRenderer();
 
     void update(Layer*, ResourceUpdateQueue&, const OcclusionTracker*);
     bool paintLayerContents(const LayerList&, ResourceUpdateQueue&);
     bool paintMasksForRenderSurface(Layer*, ResourceUpdateQueue&);
 
@@ skipping 10 matching lines @@
     void setAnimationEventsRecursive(const AnimationEventsVector&, Layer*, base::Time wallClockTime);
 
     void createHUDLayerIfNeeded();
 
     bool m_animating;
     bool m_needsAnimateLayers;
 
     base::CancelableClosure m_prepaintCallback;
 
     LayerTreeHostClient* m_client;
+    scoped_ptr<Proxy> m_proxy;
 
     int m_commitNumber;
     RenderingStats m_renderingStats;
 
-    scoped_ptr<Proxy> m_proxy;
     bool m_rendererInitialized;
     bool m_contextLost;
     int m_numTimesRecreateShouldFail;
     int m_numFailedRecreateAttempts;
 
     scoped_refptr<Layer> m_rootLayer;
     scoped_refptr<HeadsUpDisplayLayer> m_hudLayer;
 
     scoped_ptr<PrioritizedResourceManager> m_contentsTextureManager;
     scoped_ptr<PrioritizedResource> m_surfaceMemoryPlaceholder;
@@ skipping 21 matching lines @@
     size_t m_partialTextureUpdateRequests;
 
     static bool s_needsFilterContext;
 
     DISALLOW_COPY_AND_ASSIGN(LayerTreeHost);
 };
 
 }  // namespace cc
 
 #endif  // CC_LAYER_TREE_HOST_H_