| Index: cc/tiles/tile_manager.h
|
| diff --git a/cc/tiles/tile_manager.h b/cc/tiles/tile_manager.h
|
| index c041ce24d3b657cac95aa17143ddf8b9b8d06d02..6c09c2beec4db87da37557f8ce1a3f5dd97aeb25 100644
|
| --- a/cc/tiles/tile_manager.h
|
| +++ b/cc/tiles/tile_manager.h
|
| @@ -113,7 +113,8 @@ class CC_EXPORT TileManager {
|
| // SetResources.
|
| void SetResources(ResourcePool* resource_pool,
|
| TileTaskRunner* tile_task_runner,
|
| - size_t scheduled_raster_task_limit);
|
| + size_t scheduled_raster_task_limit,
|
| + bool is_using_gpu_rasterization);
|
|
|
| // This causes any completed raster work to finalize, so that tiles get up to
|
| // date draw information.
|
| @@ -127,6 +128,10 @@ class CC_EXPORT TileManager {
|
| bool IsReadyToActivate() const;
|
| bool IsReadyToDraw() const;
|
|
|
| + ImageDecodeController* GetImageDecodeController() {
|
| + return &image_decode_controller_;
|
| + }
|
| +
|
| scoped_refptr<base::trace_event::ConvertableToTraceFormat> BasicStateAsValue()
|
| const;
|
| void BasicStateAsValueInto(base::trace_event::TracedValue* dict) const;
|
| @@ -332,6 +337,8 @@ class CC_EXPORT TileManager {
|
| uint64_t prepare_tiles_count_;
|
| uint64_t next_tile_id_;
|
|
|
| + base::hash_map<Tile::Id, std::vector<DrawImage>> scheduled_draw_images_;
|
| +
|
| base::WeakPtrFactory<TileManager> task_set_finished_weak_ptr_factory_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(TileManager);
|
|
|