| Index: cc/raster/one_copy_tile_task_worker_pool.cc
|
| diff --git a/cc/raster/one_copy_tile_task_worker_pool.cc b/cc/raster/one_copy_tile_task_worker_pool.cc
|
| index 78e6b106ce94308185987f79f3d47d8bd282c630..e0a16d45cb5773a7f7e39c6b98d87a679fe6c603 100644
|
| --- a/cc/raster/one_copy_tile_task_worker_pool.cc
|
| +++ b/cc/raster/one_copy_tile_task_worker_pool.cc
|
| @@ -296,12 +296,18 @@ void OneCopyTileTaskWorkerPool::CheckForCompletedTasks() {
|
| completed_tasks_.clear();
|
| }
|
|
|
| -ResourceFormat OneCopyTileTaskWorkerPool::GetResourceFormat() const {
|
| - return resource_provider_->best_texture_format();
|
| +ResourceFormat OneCopyTileTaskWorkerPool::GetResourceFormat(
|
| + bool must_be_noncompressed,
|
| + bool must_support_alpha) const {
|
| + return resource_provider_->memory_efficient_texture_format(
|
| + must_be_noncompressed, must_support_alpha);
|
| }
|
|
|
| -bool OneCopyTileTaskWorkerPool::GetResourceRequiresSwizzle() const {
|
| - return !PlatformColor::SameComponentOrder(GetResourceFormat());
|
| +bool OneCopyTileTaskWorkerPool::GetResourceRequiresSwizzle(
|
| + bool must_be_noncompressed,
|
| + bool must_support_alpha) const {
|
| + return !PlatformColor::SameComponentOrder(
|
| + GetResourceFormat(must_be_noncompressed, must_support_alpha));
|
| }
|
|
|
| scoped_ptr<RasterBuffer> OneCopyTileTaskWorkerPool::AcquireBufferForRaster(
|
| @@ -310,11 +316,9 @@ scoped_ptr<RasterBuffer> OneCopyTileTaskWorkerPool::AcquireBufferForRaster(
|
| uint64_t previous_content_id) {
|
| // TODO(danakj): If resource_content_id != 0, we only need to copy/upload
|
| // the dirty rect.
|
| - DCHECK_EQ(resource->format(), resource_provider_->best_texture_format());
|
| return make_scoped_ptr<RasterBuffer>(
|
| new RasterBufferImpl(this, resource_provider_, resource_pool_,
|
| - resource_provider_->best_texture_format(), resource,
|
| - previous_content_id));
|
| + resource->format(), resource, previous_content_id));
|
| }
|
|
|
| void OneCopyTileTaskWorkerPool::ReleaseBufferForRaster(
|
|
|