| Index: cc/test/fake_resource_provider.h
|
| diff --git a/cc/test/fake_resource_provider.h b/cc/test/fake_resource_provider.h
|
| index f28a3db3c6cd845f5c63a6027f43985b9603252d..e0966a7c65256d276c2d253db788046c681df738 100644
|
| --- a/cc/test/fake_resource_provider.h
|
| +++ b/cc/test/fake_resource_provider.h
|
| @@ -8,6 +8,8 @@
|
| #include <stddef.h>
|
|
|
| #include "base/memory/ptr_util.h"
|
| +#include "cc/output/buffer_to_texture_target_map.h"
|
| +#include "cc/output/renderer_settings.h"
|
| #include "cc/resources/resource_provider.h"
|
| #include "ui/gfx/buffer_types.h"
|
|
|
| @@ -20,9 +22,7 @@ class FakeResourceProvider : public ResourceProvider {
|
| SharedBitmapManager* shared_bitmap_manager) {
|
| return base::WrapUnique(new FakeResourceProvider(
|
| output_surface, shared_bitmap_manager, nullptr, nullptr, 0, 1, true,
|
| - false,
|
| - std::vector<unsigned>(static_cast<size_t>(gfx::BufferFormat::LAST) + 1,
|
| - GL_TEXTURE_2D)));
|
| + false, DefaultBufferToTextureTargetMapForTesting()));
|
| }
|
|
|
| static std::unique_ptr<FakeResourceProvider> Create(
|
| @@ -32,20 +32,20 @@ class FakeResourceProvider : public ResourceProvider {
|
| return base::WrapUnique(new FakeResourceProvider(
|
| output_surface, shared_bitmap_manager, gpu_memory_buffer_manager,
|
| nullptr, 0, 1, true, false,
|
| - std::vector<unsigned>(static_cast<size_t>(gfx::BufferFormat::LAST) + 1,
|
| - GL_TEXTURE_2D)));
|
| + DefaultBufferToTextureTargetMapForTesting()));
|
| }
|
|
|
| private:
|
| - FakeResourceProvider(OutputSurface* output_surface,
|
| - SharedBitmapManager* shared_bitmap_manager,
|
| - gpu::GpuMemoryBufferManager* gpu_memory_buffer_manager,
|
| - BlockingTaskRunner* blocking_main_thread_task_runner,
|
| - int highp_threshold_min,
|
| - size_t id_allocation_chunk_size,
|
| - bool delegated_sync_points_required,
|
| - bool use_gpu_memory_buffer_resources,
|
| - const std::vector<unsigned>& use_image_texture_targets)
|
| + FakeResourceProvider(
|
| + OutputSurface* output_surface,
|
| + SharedBitmapManager* shared_bitmap_manager,
|
| + gpu::GpuMemoryBufferManager* gpu_memory_buffer_manager,
|
| + BlockingTaskRunner* blocking_main_thread_task_runner,
|
| + int highp_threshold_min,
|
| + size_t id_allocation_chunk_size,
|
| + bool delegated_sync_points_required,
|
| + bool use_gpu_memory_buffer_resources,
|
| + const BufferToTextureTargetMap& buffer_to_texture_target_map)
|
| : ResourceProvider(output_surface->context_provider(), // TODO(danakj):
|
| // Remove output
|
| // surface dep
|
| @@ -56,7 +56,7 @@ class FakeResourceProvider : public ResourceProvider {
|
| id_allocation_chunk_size,
|
| delegated_sync_points_required,
|
| use_gpu_memory_buffer_resources,
|
| - use_image_texture_targets) {}
|
| + buffer_to_texture_target_map) {}
|
| };
|
|
|
| } // namespace cc
|
|
|