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 d4a333fe0eccd7b8845014fb635f0c5be314f4d2..92d8e738435eb96c83ed9743613fedde4de9fde6 100644 |
--- a/cc/resources/one_copy_tile_task_worker_pool.cc |
+++ b/cc/resources/one_copy_tile_task_worker_pool.cc |
@@ -25,14 +25,14 @@ class RasterBufferImpl : public RasterBuffer { |
RasterBufferImpl(OneCopyTileTaskWorkerPool* worker_pool, |
ResourceProvider* resource_provider, |
ResourcePool* resource_pool, |
+ ResourceFormat resource_format, |
const Resource* resource) |
: worker_pool_(worker_pool), |
resource_provider_(resource_provider), |
resource_pool_(resource_pool), |
resource_(resource), |
raster_resource_( |
- resource_pool->AcquireResource(resource->size(), |
- resource_pool->default_format())), |
+ resource_pool->AcquireResource(resource->size(), resource_format)), |
lock_(new ResourceProvider::ScopedWriteLockGpuMemoryBuffer( |
resource_provider_, |
raster_resource_->id())), |
@@ -105,10 +105,11 @@ scoped_ptr<TileTaskWorkerPool> OneCopyTileTaskWorkerPool::Create( |
TaskGraphRunner* task_graph_runner, |
ContextProvider* context_provider, |
ResourceProvider* resource_provider, |
- ResourcePool* resource_pool) { |
+ ResourcePool* resource_pool, |
+ ResourceFormat resource_format) { |
return make_scoped_ptr<TileTaskWorkerPool>(new OneCopyTileTaskWorkerPool( |
task_runner, task_graph_runner, context_provider, resource_provider, |
- resource_pool)); |
+ resource_pool, resource_format)); |
} |
OneCopyTileTaskWorkerPool::OneCopyTileTaskWorkerPool( |
@@ -116,13 +117,15 @@ OneCopyTileTaskWorkerPool::OneCopyTileTaskWorkerPool( |
TaskGraphRunner* task_graph_runner, |
ContextProvider* context_provider, |
ResourceProvider* resource_provider, |
- ResourcePool* resource_pool) |
+ ResourcePool* resource_pool, |
+ ResourceFormat resource_format) |
: task_runner_(task_runner), |
task_graph_runner_(task_graph_runner), |
namespace_token_(task_graph_runner->GetNamespaceToken()), |
context_provider_(context_provider), |
resource_provider_(resource_provider), |
resource_pool_(resource_pool), |
+ resource_format_(resource_format), |
last_issued_copy_operation_(0), |
last_flushed_copy_operation_(0), |
lock_(), |
@@ -251,9 +254,10 @@ void OneCopyTileTaskWorkerPool::CheckForCompletedTasks() { |
scoped_ptr<RasterBuffer> OneCopyTileTaskWorkerPool::AcquireBufferForRaster( |
const Resource* resource) { |
- DCHECK_EQ(resource->format(), resource_pool_->default_format()); |
+ DCHECK_EQ(resource->format(), resource_format_); |
return make_scoped_ptr<RasterBuffer>( |
- new RasterBufferImpl(this, resource_provider_, resource_pool_, resource)); |
+ new RasterBufferImpl(this, resource_provider_, resource_pool_, |
+ resource_format_, resource)); |
} |
void OneCopyTileTaskWorkerPool::ReleaseBufferForRaster( |