Index: cc/layer_tree_host.h |
diff --git a/cc/layer_tree_host.h b/cc/layer_tree_host.h |
index bdf5759d58bfdd1e2ef95c6f090a2c4b037e0406..fdc5f15377f331f14cf21e30e9e6ba5c7334226a 100644 |
--- a/cc/layer_tree_host.h |
+++ b/cc/layer_tree_host.h |
@@ -92,7 +92,7 @@ struct RendererCapabilities { |
class LayerTreeHost : public RateLimiterClient { |
public: |
- static scoped_ptr<LayerTreeHost> create(LayerTreeHostClient*, const LayerTreeSettings&); |
+ static scoped_ptr<LayerTreeHost> create(LayerTreeHostClient*, const LayerTreeSettings&, Thread* implThread); |
jamesr
2012/10/31 06:38:19
scoped_ptr<Thread> would be better since it takes
|
virtual ~LayerTreeHost(); |
void setSurfaceReady(); |
@@ -210,9 +210,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(Thread* implThread); |
private: |
typedef std::vector<scoped_refptr<Layer> > LayerList; |
@@ -241,11 +243,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; |