| 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 96e580fc16a4cffdb186cefdf091cec3047fabe7..c3ed323736b0198ea743561bfbdcad6feb1b9fe6 100644
|
| --- a/cc/trees/layer_tree_host_impl.h
|
| +++ b/cc/trees/layer_tree_host_impl.h
|
| @@ -31,6 +31,7 @@
|
| #include "cc/quads/render_pass.h"
|
| #include "cc/resources/resource_provider.h"
|
| #include "cc/resources/tile_manager.h"
|
| +#include "cc/resources/tile_priority_queue.h"
|
| #include "cc/scheduler/draw_result.h"
|
| #include "skia/ext/refptr.h"
|
| #include "third_party/skia/include/core/SkColor.h"
|
| @@ -232,9 +233,13 @@ class CC_EXPORT LayerTreeHostImpl
|
| virtual void RunOnDemandRasterTask(Task* on_demand_raster_task) OVERRIDE;
|
|
|
| // TileManagerClient implementation.
|
| - virtual const std::vector<PictureLayerImpl*>& GetPictureLayers() OVERRIDE;
|
| + virtual const std::vector<PictureLayerImpl*>& GetPictureLayers()
|
| + const OVERRIDE;
|
| virtual void NotifyReadyToActivate() OVERRIDE;
|
| virtual void NotifyTileStateChanged(const Tile* tile) OVERRIDE;
|
| + virtual RasterTileQueue* GetRasterQueue(TreePriority tree_priority) OVERRIDE;
|
| + virtual EvictionTileQueue* GetEvictionQueue(
|
| + TreePriority tree_prirority) OVERRIDE;
|
|
|
| // ScrollbarAnimationControllerClient implementation.
|
| virtual void PostDelayedScrollbarFade(const base::Closure& start_fade,
|
| @@ -497,6 +502,8 @@ class CC_EXPORT LayerTreeHostImpl
|
| void ReleaseTreeResources();
|
| void EnforceZeroBudget(bool zero_budget);
|
|
|
| + void GetPairedPictureLayers(std::vector<PairedPictureLayer>* layers) const;
|
| +
|
| bool UsePendingTreeForSync() const;
|
| bool UseZeroCopyTextureUpload() const;
|
| bool UseOneCopyTextureUpload() const;
|
| @@ -690,6 +697,9 @@ class CC_EXPORT LayerTreeHostImpl
|
|
|
| std::vector<PictureLayerImpl*> picture_layers_;
|
|
|
| + RasterTileQueue raster_queue_;
|
| + EvictionTileQueue eviction_queue_;
|
| +
|
| DISALLOW_COPY_AND_ASSIGN(LayerTreeHostImpl);
|
| };
|
|
|
|
|