Index: cc/layer_tree_host.h |
diff --git a/cc/layer_tree_host.h b/cc/layer_tree_host.h |
index c574888d59cdc87bfd34b4d3583a0e5367c49c3d..b81c7ca08452f99c9657ac2e24f5dda8e1415f7d 100644 |
--- a/cc/layer_tree_host.h |
+++ b/cc/layer_tree_host.h |
@@ -74,7 +74,7 @@ struct CC_EXPORT LayerTreeSettings { |
}; |
// Provides information on an Impl's rendering capabilities back to the LayerTreeHost |
-struct RendererCapabilities { |
+struct CC_EXPORT RendererCapabilities { |
RendererCapabilities(); |
~RendererCapabilities(); |
@@ -92,7 +92,7 @@ struct RendererCapabilities { |
class CC_EXPORT 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(); |
@@ -133,8 +133,9 @@ public: |
LayerTreeHostClient* client() { return m_client; } |
- // Only used when compositing on the main thread. |
void composite(); |
+ |
+ // Only used when compositing on the main thread. |
void scheduleComposite(); |
// Composites and attempts to read back the result into the provided |
@@ -212,9 +213,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; |
@@ -245,11 +248,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; |