Index: cc/tiles/tile_manager.h |
diff --git a/cc/tiles/tile_manager.h b/cc/tiles/tile_manager.h |
index dfcf4786cca7566bc46beb6ed40486fd403712fe..b98c4ec49ad83ca0a26e2837f05f8ed0f978add4 100644 |
--- a/cc/tiles/tile_manager.h |
+++ b/cc/tiles/tile_manager.h |
@@ -18,7 +18,7 @@ |
#include "base/values.h" |
#include "cc/base/unique_notifier.h" |
#include "cc/playback/raster_source.h" |
-#include "cc/raster/tile_task_worker_pool.h" |
+#include "cc/raster/raster_buffer_provider.h" |
#include "cc/resources/memory_history.h" |
#include "cc/resources/resource_pool.h" |
#include "cc/tiles/eviction_tile_priority_queue.h" |
@@ -26,6 +26,7 @@ |
#include "cc/tiles/raster_tile_priority_queue.h" |
#include "cc/tiles/tile.h" |
#include "cc/tiles/tile_draw_info.h" |
+#include "cc/tiles/tile_task_manager.h" |
namespace base { |
namespace trace_event { |
@@ -117,8 +118,8 @@ class CC_EXPORT TileManager { |
// FinishTasksAndCleanUp must be called in between consecutive calls to |
// SetResources. |
void SetResources(ResourcePool* resource_pool, |
- TileTaskWorkerPool* tile_task_worker_pool, |
ImageDecodeController* image_decode_controller, |
+ TileTaskManager* tile_task_manager, |
size_t scheduled_raster_task_limit, |
bool use_gpu_rasterization); |
@@ -147,7 +148,8 @@ class CC_EXPORT TileManager { |
TileDrawInfo& draw_info = tiles[i]->draw_info(); |
draw_info.resource_ = resource_pool_->AcquireResource( |
tiles[i]->desired_texture_size(), |
- tile_task_worker_pool_->GetResourceFormat(false)); |
+ tile_task_manager_->GetRasterBufferProvider()->GetResourceFormat( |
+ false)); |
} |
} |
@@ -163,8 +165,7 @@ class CC_EXPORT TileManager { |
global_state_ = state; |
} |
- void SetTileTaskWorkerPoolForTesting( |
- TileTaskWorkerPool* tile_task_worker_pool); |
+ void SetTileTaskManagerForTesting(TileTaskManager* tile_task_manager); |
void FreeResourcesAndCleanUpReleasedTilesForTesting() { |
FreeResourcesForReleasedTiles(); |
@@ -287,7 +288,7 @@ class CC_EXPORT TileManager { |
TileManagerClient* client_; |
scoped_refptr<base::SequencedTaskRunner> task_runner_; |
ResourcePool* resource_pool_; |
- TileTaskWorkerPool* tile_task_worker_pool_; |
+ TileTaskManager* tile_task_manager_; |
GlobalStateThatImpactsTilePriority global_state_; |
size_t scheduled_raster_task_limit_; |
const bool use_partial_raster_; |