summaryrefslogtreecommitdiffstats
path: root/cc/layer_tree_host.h
diff options
context:
space:
mode:
authorjamesr@chromium.org <jamesr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-11-01 19:48:47 +0000
committerjamesr@chromium.org <jamesr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-11-01 19:48:47 +0000
commitb375853a5b2305fe3cc689e2b3712bf42258ef4d (patch)
treeed1707a941a96624ba442f4360b736e5416a3158 /cc/layer_tree_host.h
parentb2b06c4f160763133874468c5f6715afc8832e06 (diff)
downloadchromium_src-b375853a5b2305fe3cc689e2b3712bf42258ef4d.zip
chromium_src-b375853a5b2305fe3cc689e2b3712bf42258ef4d.tar.gz
chromium_src-b375853a5b2305fe3cc689e2b3712bf42258ef4d.tar.bz2
Remove static thread pointers from CC
BUG=152904 Review URL: https://codereview.chromium.org/11232051 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@165476 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'cc/layer_tree_host.h')
-rw-r--r--cc/layer_tree_host.h8
1 files changed, 5 insertions, 3 deletions
diff --git a/cc/layer_tree_host.h b/cc/layer_tree_host.h
index 7879d1a..a660e27 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;