| Index: cc/layer_tree_host_impl.h
|
| diff --git a/cc/layer_tree_host_impl.h b/cc/layer_tree_host_impl.h
|
| index 0d51dbfbf5b8ab31bde76ee9fa8cc6c87294da71..b95607494b9663b0a36a058f7081fa06f4bf20ac 100644
|
| --- a/cc/layer_tree_host_impl.h
|
| +++ b/cc/layer_tree_host_impl.h
|
| @@ -173,7 +173,6 @@ public:
|
| const LayerTreeImpl* recycleTree() const { return m_recycleTree.get(); }
|
| void createPendingTree();
|
| void checkForCompletedTileUploads();
|
| - scoped_ptr<base::Value> activationStateAsValue() const;
|
| virtual void activatePendingTreeIfNeeded();
|
|
|
| // Shortcuts to layers on the active tree.
|
| @@ -260,6 +259,10 @@ public:
|
| void beginNextFrame();
|
| base::TimeTicks currentFrameTime();
|
|
|
| + scoped_ptr<base::Value> asValue() const;
|
| + scoped_ptr<base::Value> activationStateAsValue() const;
|
| + scoped_ptr<base::Value> frameStateAsValue() const;
|
| +
|
| protected:
|
| LayerTreeHostImpl(const LayerTreeSettings&, LayerTreeHostImplClient*, Proxy*);
|
| void activatePendingTree();
|
|
|