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

Unified Diff: cc/resources/one_copy_tile_task_worker_pool.cc

Issue 817133006: Support different formats in the same resource pool. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Add a TODO about removing the default format. Created 5 years, 11 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/resources/gpu_rasterizer.cc ('k') | cc/resources/resource_pool.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/resources/one_copy_tile_task_worker_pool.cc
diff --git a/cc/resources/one_copy_tile_task_worker_pool.cc b/cc/resources/one_copy_tile_task_worker_pool.cc
index dcb8dea819d67073bf38150b98e4a658595c2b11..d4a333fe0eccd7b8845014fb635f0c5be314f4d2 100644
--- a/cc/resources/one_copy_tile_task_worker_pool.cc
+++ b/cc/resources/one_copy_tile_task_worker_pool.cc
@@ -30,7 +30,9 @@ class RasterBufferImpl : public RasterBuffer {
resource_provider_(resource_provider),
resource_pool_(resource_pool),
resource_(resource),
- raster_resource_(resource_pool->AcquireResource(resource->size())),
+ raster_resource_(
+ resource_pool->AcquireResource(resource->size(),
+ resource_pool->default_format())),
lock_(new ResourceProvider::ScopedWriteLockGpuMemoryBuffer(
resource_provider_,
raster_resource_->id())),
@@ -249,7 +251,7 @@ void OneCopyTileTaskWorkerPool::CheckForCompletedTasks() {
scoped_ptr<RasterBuffer> OneCopyTileTaskWorkerPool::AcquireBufferForRaster(
const Resource* resource) {
- DCHECK_EQ(resource->format(), resource_pool_->resource_format());
+ DCHECK_EQ(resource->format(), resource_pool_->default_format());
return make_scoped_ptr<RasterBuffer>(
new RasterBufferImpl(this, resource_provider_, resource_pool_, resource));
}
« no previous file with comments | « cc/resources/gpu_rasterizer.cc ('k') | cc/resources/resource_pool.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698