Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(27)

Unified Diff: cc/layer_tree_host.h

Issue 11232051: Remove static thread pointers from CC (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Created 8 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: cc/layer_tree_host.h
diff --git a/cc/layer_tree_host.h b/cc/layer_tree_host.h
index 4405d586f47a17f146ff880c3aec6a993605308d..9f2ea7132abba49555afccde8ad141928f590006 100644
--- a/cc/layer_tree_host.h
+++ b/cc/layer_tree_host.h
@@ -23,6 +23,7 @@
#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 dep
#if defined(COMPILER_GCC)
namespace BASE_HASH_NAMESPACE {
@@ -90,7 +91,7 @@ struct RendererCapabilities {
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();
@@ -204,9 +205,11 @@ public:
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;

Powered by Google App Engine
This is Rietveld 408576698