Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1371)

Unified Diff: cc/tiles/tile_manager.cc

Issue 2046033002: Revert of cc: Add mailbox support to ResourceProvider write locks. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@worker_context_stream
Patch Set: Created 4 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « cc/tiles/tile_manager.h ('k') | cc/tiles/tile_manager_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/tiles/tile_manager.cc
diff --git a/cc/tiles/tile_manager.cc b/cc/tiles/tile_manager.cc
index 02e00c35ae69fa3870f82112e37e2b8e1369a423..27a709fb9c3cf34ee30067fab94acdf61ecc1a5a 100644
--- a/cc/tiles/tile_manager.cc
+++ b/cc/tiles/tile_manager.cc
@@ -344,9 +344,8 @@
// uninitialized resources.
tile_task_manager_->Shutdown();
- raster_buffer_provider_->Shutdown();
-
- // Now that all tasks have been finished, we can clear any |orphan_tasks_|.
+ // Now that all tasks have been finished, we can clear any
+ // |orphan_tasks_|.
orphan_tasks_.clear();
tile_task_manager_->CheckForCompletedTasks();
@@ -364,7 +363,6 @@
void TileManager::SetResources(ResourcePool* resource_pool,
ImageDecodeController* image_decode_controller,
TileTaskManager* tile_task_manager,
- RasterBufferProvider* raster_buffer_provider,
size_t scheduled_raster_task_limit,
bool use_gpu_rasterization) {
DCHECK(!tile_task_manager_);
@@ -375,7 +373,6 @@
resource_pool_ = resource_pool;
image_decode_controller_ = image_decode_controller;
tile_task_manager_ = tile_task_manager;
- raster_buffer_provider_ = raster_buffer_provider;
}
void TileManager::Release(Tile* tile) {
@@ -838,9 +835,6 @@
resource_pool_->ReduceResourceUsage();
image_decode_controller_->ReduceCacheUsage();
- // Synchronize worker with compositor.
- raster_buffer_provider_->OrderingBarrier();
-
// Schedule running of |raster_queue_|. This replaces any previously
// scheduled tasks and effectively cancels all tasks not present
// in |raster_queue_|.
@@ -918,7 +912,7 @@
bool supports_concurrent_execution = !use_gpu_rasterization_;
std::unique_ptr<RasterBuffer> raster_buffer =
- raster_buffer_provider_->AcquireBufferForRaster(
+ tile_task_manager_->GetRasterBufferProvider()->AcquireBufferForRaster(
resource, resource_content_id, tile->invalidated_id());
return make_scoped_refptr(new RasterTaskImpl(
this, tile, resource, prioritized_tile.raster_source(), playback_settings,
@@ -933,7 +927,8 @@
bool was_canceled) {
DCHECK(tile);
DCHECK(tiles_.find(tile->id()) != tiles_.end());
- raster_buffer_provider_->ReleaseBufferForRaster(std::move(raster_buffer));
+ tile_task_manager_->GetRasterBufferProvider()->ReleaseBufferForRaster(
+ std::move(raster_buffer));
TileDrawInfo& draw_info = tile->draw_info();
DCHECK(tile->raster_task_.get());
@@ -987,11 +982,6 @@
void TileManager::SetTileTaskManagerForTesting(
TileTaskManager* tile_task_manager) {
tile_task_manager_ = tile_task_manager;
-}
-
-void TileManager::SetRasterBufferProviderForTesting(
- RasterBufferProvider* raster_buffer_provider) {
- raster_buffer_provider_ = raster_buffer_provider;
}
bool TileManager::AreRequiredTilesReadyToDraw(
@@ -1156,12 +1146,13 @@
}
ResourceFormat TileManager::DetermineResourceFormat(const Tile* tile) const {
- return raster_buffer_provider_->GetResourceFormat(!tile->is_opaque());
+ return tile_task_manager_->GetRasterBufferProvider()->GetResourceFormat(
+ !tile->is_opaque());
}
bool TileManager::DetermineResourceRequiresSwizzle(const Tile* tile) const {
- return raster_buffer_provider_->GetResourceRequiresSwizzle(
- !tile->is_opaque());
+ return tile_task_manager_->GetRasterBufferProvider()
+ ->GetResourceRequiresSwizzle(!tile->is_opaque());
}
std::unique_ptr<base::trace_event::ConvertableToTraceFormat>
« no previous file with comments | « cc/tiles/tile_manager.h ('k') | cc/tiles/tile_manager_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698