| 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 bb3d1f0720c971af7dd15dd6aa851ed7677cf607..d6dd2c5e903974a5f38a2f65f751802239361eee 100644
|
| --- a/cc/trees/layer_tree_host_impl.h
|
| +++ b/cc/trees/layer_tree_host_impl.h
|
| @@ -41,7 +41,6 @@
|
| class CompletionEvent;
|
| class CompositorFrameMetadata;
|
| class DebugRectHistory;
|
| -class EvictionTilePriorityQueue;
|
| class FrameRateCounter;
|
| class LayerImpl;
|
| class LayerTreeHostImplTimeSourceAdapter;
|
| @@ -50,7 +49,6 @@
|
| class PageScaleAnimation;
|
| class PaintTimeCounter;
|
| class PictureLayerImpl;
|
| -class RasterTilePriorityQueue;
|
| class RasterWorkerPool;
|
| class RenderPassDrawQuad;
|
| class RenderingStatsInstrumentation;
|
| @@ -235,14 +233,9 @@
|
| virtual void RunOnDemandRasterTask(Task* on_demand_raster_task) OVERRIDE;
|
|
|
| // TileManagerClient implementation.
|
| - virtual const std::vector<PictureLayerImpl*>& GetPictureLayers()
|
| - const OVERRIDE;
|
| + virtual const std::vector<PictureLayerImpl*>& GetPictureLayers() OVERRIDE;
|
| virtual void NotifyReadyToActivate() OVERRIDE;
|
| virtual void NotifyTileStateChanged(const Tile* tile) OVERRIDE;
|
| - virtual void BuildRasterQueue(RasterTilePriorityQueue* queue,
|
| - TreePriority tree_priority) OVERRIDE;
|
| - virtual void BuildEvictionQueue(EvictionTilePriorityQueue* queue,
|
| - TreePriority tree_priority) OVERRIDE;
|
|
|
| // ScrollbarAnimationControllerClient implementation.
|
| virtual void PostDelayedScrollbarFade(const base::Closure& start_fade,
|
| @@ -470,9 +463,6 @@
|
| void RegisterPictureLayerImpl(PictureLayerImpl* layer);
|
| void UnregisterPictureLayerImpl(PictureLayerImpl* layer);
|
|
|
| - void GetPictureLayerImplPairs(
|
| - std::vector<PictureLayerImpl::Pair>* layers) const;
|
| -
|
| protected:
|
| LayerTreeHostImpl(
|
| const LayerTreeSettings& settings,
|
| @@ -700,7 +690,6 @@
|
| size_t transfer_buffer_memory_limit_;
|
|
|
| std::vector<PictureLayerImpl*> picture_layers_;
|
| - std::vector<PictureLayerImpl::Pair> picture_layer_pairs_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(LayerTreeHostImpl);
|
| };
|
|
|