| Index: cc/resources/tile_manager.h
|
| diff --git a/cc/resources/tile_manager.h b/cc/resources/tile_manager.h
|
| index a5005bf7f3cce2da6d11082e5567633af2468a1a..476292285abe8b690a37f37a9d0a6181e153144d 100644
|
| --- a/cc/resources/tile_manager.h
|
| +++ b/cc/resources/tile_manager.h
|
| @@ -16,6 +16,7 @@
|
| #include "base/values.h"
|
| #include "cc/base/ref_counted_managed.h"
|
| #include "cc/base/unique_notifier.h"
|
| +#include "cc/debug/worker_thread_cost_tracker.h"
|
| #include "cc/resources/eviction_tile_priority_queue.h"
|
| #include "cc/resources/managed_tile_state.h"
|
| #include "cc/resources/memory_history.h"
|
| @@ -101,7 +102,8 @@ class CC_EXPORT TileManager : public TileTaskRunnerClient,
|
| base::SequencedTaskRunner* task_runner,
|
| ResourcePool* resource_pool,
|
| TileTaskRunner* tile_task_runner,
|
| - size_t scheduled_raster_task_limit);
|
| + size_t scheduled_raster_task_limit,
|
| + WorkerThreadCostTracker* worker_thread_cost_tracker);
|
| ~TileManager() override;
|
|
|
| // Assigns tile memory and schedules work to prepare tiles for drawing.
|
| @@ -174,7 +176,8 @@ class CC_EXPORT TileManager : public TileTaskRunnerClient,
|
| const scoped_refptr<base::SequencedTaskRunner>& task_runner,
|
| ResourcePool* resource_pool,
|
| TileTaskRunner* tile_task_runner,
|
| - size_t scheduled_raster_task_limit);
|
| + size_t scheduled_raster_task_limit,
|
| + WorkerThreadCostTracker* worker_thread_cost_tracker);
|
|
|
| void FreeResourcesForReleasedTiles();
|
| void CleanUpReleasedTiles();
|
| @@ -217,13 +220,17 @@ class CC_EXPORT TileManager : public TileTaskRunnerClient,
|
| int resource_count_;
|
| };
|
|
|
| - void OnImageDecodeTaskCompleted(int layer_id,
|
| - SkPixelRef* pixel_ref,
|
| - bool was_canceled);
|
| - void OnRasterTaskCompleted(Tile::Id tile,
|
| - scoped_ptr<ScopedResource> resource,
|
| - const RasterSource::SolidColorAnalysis& analysis,
|
| - bool was_canceled);
|
| + void OnImageDecodeTaskCompleted(
|
| + int layer_id,
|
| + SkPixelRef* pixel_ref,
|
| + bool was_canceled,
|
| + scoped_ptr<WorkerThreadCostTracker::Probe> cost_tracker_probe);
|
| + void OnRasterTaskCompleted(
|
| + Tile::Id tile,
|
| + scoped_ptr<ScopedResource> resource,
|
| + const RasterSource::SolidColorAnalysis& analysis,
|
| + bool was_canceled,
|
| + scoped_ptr<WorkerThreadCostTracker::Probe> cost_tracker_probe);
|
|
|
| void FreeResourcesForTile(Tile* tile);
|
| void FreeResourcesForTileAndNotifyClientIfTileWasReadyToDraw(Tile* tile);
|
| @@ -289,6 +296,8 @@ class CC_EXPORT TileManager : public TileTaskRunnerClient,
|
| bool did_notify_ready_to_activate_;
|
| bool did_notify_ready_to_draw_;
|
|
|
| + WorkerThreadCostTracker* worker_thread_cost_tracker_;
|
| +
|
| DISALLOW_COPY_AND_ASSIGN(TileManager);
|
| };
|
|
|
|
|