| Index: cc/raster/zero_copy_tile_task_worker_pool.cc
|
| diff --git a/cc/raster/zero_copy_tile_task_worker_pool.cc b/cc/raster/zero_copy_tile_task_worker_pool.cc
|
| index c2358a6c79ccb11910c1e01925868812ece4c887..8830c1f021772f89c1ac382be0a40e9ad01d013f 100644
|
| --- a/cc/raster/zero_copy_tile_task_worker_pool.cc
|
| +++ b/cc/raster/zero_copy_tile_task_worker_pool.cc
|
| @@ -65,22 +65,22 @@
|
| base::SequencedTaskRunner* task_runner,
|
| TaskGraphRunner* task_graph_runner,
|
| ResourceProvider* resource_provider,
|
| - ResourceFormat preferred_tile_format) {
|
| - return make_scoped_ptr<TileTaskWorkerPool>(
|
| - new ZeroCopyTileTaskWorkerPool(task_runner, task_graph_runner,
|
| - resource_provider, preferred_tile_format));
|
| + bool use_rgba_4444_texture_format) {
|
| + return make_scoped_ptr<TileTaskWorkerPool>(new ZeroCopyTileTaskWorkerPool(
|
| + task_runner, task_graph_runner, resource_provider,
|
| + use_rgba_4444_texture_format));
|
| }
|
|
|
| ZeroCopyTileTaskWorkerPool::ZeroCopyTileTaskWorkerPool(
|
| base::SequencedTaskRunner* task_runner,
|
| TaskGraphRunner* task_graph_runner,
|
| ResourceProvider* resource_provider,
|
| - ResourceFormat preferred_tile_format)
|
| + bool use_rgba_4444_texture_format)
|
| : task_runner_(task_runner),
|
| task_graph_runner_(task_graph_runner),
|
| namespace_token_(task_graph_runner->GetNamespaceToken()),
|
| resource_provider_(resource_provider),
|
| - preferred_tile_format_(preferred_tile_format) {}
|
| + use_rgba_4444_texture_format_(use_rgba_4444_texture_format) {}
|
|
|
| ZeroCopyTileTaskWorkerPool::~ZeroCopyTileTaskWorkerPool() {
|
| }
|
| @@ -122,13 +122,9 @@
|
|
|
| ResourceFormat ZeroCopyTileTaskWorkerPool::GetResourceFormat(
|
| bool must_support_alpha) const {
|
| - if (resource_provider_->IsResourceFormatSupported(preferred_tile_format_) &&
|
| - (DoesResourceFormatSupportAlpha(preferred_tile_format_) ||
|
| - !must_support_alpha)) {
|
| - return preferred_tile_format_;
|
| - }
|
| -
|
| - return resource_provider_->best_texture_format();
|
| + return use_rgba_4444_texture_format_
|
| + ? RGBA_4444
|
| + : resource_provider_->best_texture_format();
|
| }
|
|
|
| bool ZeroCopyTileTaskWorkerPool::GetResourceRequiresSwizzle(
|
|
|