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 CCLayerTreeHost_h
 #define CCLayerTreeHost_h
 
 #include <limits>
 
 #include "CCAnimationEvents.h"
 #include "CCGraphicsContext.h"
 #include "CCLayerTreeHostClient.h"
 #include "CCLayerTreeHostCommon.h"
 #include "IntRect.h"
 #include "base/basictypes.h"
 #include "base/hash_tables.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "cc/occlusion_tracker.h"
 #include "cc/prioritized_texture_manager.h"
 #include "cc/proxy.h"
 #include "cc/rate_limiter.h"
 #include "cc/rendering_stats.h"
 #include "cc/scoped_ptr_vector.h"
 #include "third_party/skia/include/core/SkColor.h"
+#include <public/WebThread.h>

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

this isn't good - we should be removing WebKit dependencies from cc/, not adding
more. can this class the cc::CCThread type instead?

 
 #if defined(COMPILER_GCC)
 namespace BASE_HASH_NAMESPACE {
 template<>
 struct hash<WebKit::WebGraphicsContext3D*> {
   size_t operator()(WebKit::WebGraphicsContext3D* ptr) const {
     return hash<size_t>()(reinterpret_cast<size_t>(ptr));
   }
 };
 } // namespace BASE_HASH_NAMESPACE
@@ skipping 47 matching lines @@
     bool usingSetVisibility;
     bool usingSwapCompleteCallback;
     bool usingGpuMemoryManager;
     bool usingDiscardFramebuffer;
     bool usingEglImage;
     int maxTextureSize;
 };
 
 class CCLayerTreeHost : public RateLimiterClient {
 public:
-    static scoped_ptr<CCLayerTreeHost> create(CCLayerTreeHostClient*, const CCLayerTreeSettings&);
+    static scoped_ptr<CCLayerTreeHost> create(CCLayerTreeHostClient*, const CCLayerTreeSettings&, CompositorSupportState*);
     virtual ~CCLayerTreeHost();
 
     void setSurfaceReady();
 
     // Returns true if any CCLayerTreeHost 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 93 matching lines @@
     bool requestPartialTextureUpdate();
     void deleteTextureAfterCommit(scoped_ptr<CCPrioritizedTexture>);
 
     void setDeviceScaleFactor(float);
     float deviceScaleFactor() const { return m_deviceScaleFactor; }
 
     void setFontAtlas(scoped_ptr<CCFontAtlas>);
 
     HeadsUpDisplayLayerChromium* hudLayer() const { return m_hudLayer.get(); }
 
+    CCProxy* proxy() const { return m_proxy.get(); }
+
 protected:
     CCLayerTreeHost(CCLayerTreeHostClient*, const CCLayerTreeSettings&);
-    bool initialize();
+    bool initialize(WebKit::WebThread* compositorThread);
 
 private:
     typedef std::vector<scoped_refptr<LayerChromium> > LayerList;
 
     void initializeRenderer();
 
     void update(LayerChromium*, CCTextureUpdateQueue&, const CCOcclusionTracker*);
     bool paintLayerContents(const LayerList&, CCTextureUpdateQueue&);
     bool paintMasksForRenderSurface(LayerChromium*, CCTextureUpdateQueue&);
 
@@ skipping 53 matching lines @@
     size_t m_partialTextureUpdateRequests;
 
     static bool s_needsFilterContext;
 
     DISALLOW_COPY_AND_ASSIGN(CCLayerTreeHost);
 };
 
 }  // namespace cc
 
 #endif