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

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: Rebase to 165444 Created 8 years, 1 month 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 7879d1aadb5cf77dcfa5718cb183ea5875451f43..a660e278bf3bf51dac800c8583da7867c969e857 100644
--- a/cc/layer_tree_host.h
+++ b/cc/layer_tree_host.h
@@ -93,7 +93,7 @@ struct RendererCapabilities {
class 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();
@@ -212,9 +212,11 @@ public:
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;
@@ -243,11 +245,11 @@ private:
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;

Powered by Google App Engine
This is Rietveld 408576698