| Index: cc/test/fake_resource_provider.h
|
| diff --git a/cc/test/fake_resource_provider.h b/cc/test/fake_resource_provider.h
|
| index c96bebad6474d1101256fe3de2bc6fb5ad04db8f..2295a4f125b44fb8d584c471b71cfa21eec67f31 100644
|
| --- a/cc/test/fake_resource_provider.h
|
| +++ b/cc/test/fake_resource_provider.h
|
| @@ -6,6 +6,7 @@
|
| #define CC_TEST_FAKE_RESOURCE_PROVIDER_H_
|
|
|
| #include "cc/resources/resource_provider.h"
|
| +#include "ui/gfx/buffer_types.h"
|
|
|
| namespace cc {
|
|
|
| @@ -14,9 +15,11 @@ class FakeResourceProvider : public ResourceProvider {
|
| static scoped_ptr<FakeResourceProvider> Create(
|
| OutputSurface* output_surface,
|
| SharedBitmapManager* shared_bitmap_manager) {
|
| - scoped_ptr<FakeResourceProvider> provider(
|
| - new FakeResourceProvider(output_surface, shared_bitmap_manager, nullptr,
|
| - nullptr, 0, false, 1, false));
|
| + scoped_ptr<FakeResourceProvider> provider(new FakeResourceProvider(
|
| + output_surface, shared_bitmap_manager, nullptr, nullptr, 0, false, 1,
|
| + false,
|
| + std::vector<unsigned>(static_cast<size_t>(gfx::BufferFormat::LAST) + 1,
|
| + GL_TEXTURE_2D)));
|
| provider->Initialize();
|
| return provider;
|
| }
|
| @@ -27,7 +30,9 @@ class FakeResourceProvider : public ResourceProvider {
|
| gpu::GpuMemoryBufferManager* gpu_memory_buffer_manager) {
|
| scoped_ptr<FakeResourceProvider> provider(new FakeResourceProvider(
|
| output_surface, shared_bitmap_manager, gpu_memory_buffer_manager,
|
| - nullptr, 0, false, 1, false));
|
| + nullptr, 0, false, 1, false,
|
| + std::vector<unsigned>(static_cast<size_t>(gfx::BufferFormat::LAST) + 1,
|
| + GL_TEXTURE_2D)));
|
| provider->Initialize();
|
| return provider;
|
| }
|
| @@ -40,7 +45,8 @@ class FakeResourceProvider : public ResourceProvider {
|
| int highp_threshold_min,
|
| bool use_rgba_4444_texture_format,
|
| size_t id_allocation_chunk_size,
|
| - bool use_persistent_map_for_gpu_memory_buffers)
|
| + bool use_persistent_map_for_gpu_memory_buffers,
|
| + const std::vector<unsigned>& use_image_texture_targets)
|
| : ResourceProvider(output_surface,
|
| shared_bitmap_manager,
|
| gpu_memory_buffer_manager,
|
| @@ -48,7 +54,8 @@ class FakeResourceProvider : public ResourceProvider {
|
| highp_threshold_min,
|
| use_rgba_4444_texture_format,
|
| id_allocation_chunk_size,
|
| - use_persistent_map_for_gpu_memory_buffers) {}
|
| + use_persistent_map_for_gpu_memory_buffers,
|
| + use_image_texture_targets) {}
|
| };
|
|
|
| } // namespace cc
|
|
|