| Index: cc/trees/layer_tree_host_impl.h
|
| diff --git a/cc/trees/layer_tree_host_impl.h b/cc/trees/layer_tree_host_impl.h
|
| index 48cbd7df4cdf42549f9bc7aef5a61cbde4f6d24f..f66f5b1de838ffcd499bdc4c3f945123973cbffc 100644
|
| --- a/cc/trees/layer_tree_host_impl.h
|
| +++ b/cc/trees/layer_tree_host_impl.h
|
| @@ -265,7 +265,7 @@ class CC_EXPORT LayerTreeHostImpl
|
| void ScrollOffsetAnimationFinished() override;
|
| gfx::ScrollOffset GetScrollOffsetForAnimation(int layer_id) const override;
|
|
|
| - virtual void PrepareTiles();
|
| + virtual bool PrepareTiles();
|
|
|
| // Returns DRAW_SUCCESS unless problems occured preparing the frame, and we
|
| // should try to avoid displaying the frame. If PrepareToDraw is called,
|
| @@ -617,8 +617,8 @@ class CC_EXPORT LayerTreeHostImpl
|
| const gfx::Vector2dF& viewport_delta);
|
|
|
| void CreateAndSetRenderer();
|
| - void CreateAndSetTileManager();
|
| - void DestroyTileManager();
|
| + void CleanUpTileManager();
|
| + void CreateTileManagerResources();
|
| void ReleaseTreeResources();
|
| void RecreateTreeResources();
|
|
|
| @@ -700,7 +700,6 @@ class CC_EXPORT LayerTreeHostImpl
|
| scoped_ptr<OutputSurface> output_surface_;
|
|
|
| scoped_ptr<ResourceProvider> resource_provider_;
|
| - scoped_ptr<TileManager> tile_manager_;
|
| bool content_is_suitable_for_gpu_rasterization_;
|
| bool has_gpu_rasterization_trigger_;
|
| bool use_gpu_rasterization_;
|
| @@ -748,6 +747,8 @@ class CC_EXPORT LayerTreeHostImpl
|
| bool visible_;
|
| ManagedMemoryPolicy cached_managed_memory_policy_;
|
|
|
| + scoped_ptr<TileManager> tile_manager_;
|
| +
|
| gfx::Vector2dF accumulated_root_overscroll_;
|
|
|
| bool pinch_gesture_active_;
|
|
|