Index: cc/test/pixel_test.cc |
diff --git a/cc/test/pixel_test.cc b/cc/test/pixel_test.cc |
index 690031993b0349deb3e375efc80f03ec4530f256..c47a083b998ccacec2e5e1b95bfcf812d984ce29 100644 |
--- a/cc/test/pixel_test.cc |
+++ b/cc/test/pixel_test.cc |
@@ -23,6 +23,7 @@ |
#include "cc/test/pixel_test_output_surface.h" |
#include "cc/test/pixel_test_software_output_device.h" |
#include "cc/test/pixel_test_utils.h" |
+#include "cc/test/test_gpu_memory_buffer_manager.h" |
#include "cc/test/test_in_process_context_provider.h" |
#include "cc/test/test_shared_bitmap_manager.h" |
#include "cc/trees/blocking_task_runner.h" |
@@ -114,14 +115,17 @@ void PixelTest::SetUpGLRenderer(bool use_skia_gpu_backend) { |
new PixelTestOutputSurface(new TestInProcessContextProvider)); |
output_surface_->BindToClient(output_surface_client_.get()); |
- shared_bitmap_manager_.reset(new TestSharedBitmapManager()); |
- resource_provider_ = ResourceProvider::Create(output_surface_.get(), |
- shared_bitmap_manager_.get(), |
- main_thread_task_runner_.get(), |
- 0, |
- false, |
- 1, |
- false); |
+ shared_bitmap_manager_.reset(new TestSharedBitmapManager); |
+ gpu_memory_buffer_manager_.reset(new TestGpuMemoryBufferManager); |
+ resource_provider_ = |
+ ResourceProvider::Create(output_surface_.get(), |
+ shared_bitmap_manager_.get(), |
+ gpu_memory_buffer_manager_.get(), |
+ main_thread_task_runner_.get(), |
+ 0, |
+ false, |
+ 1, |
+ false); |
texture_mailbox_deleter_ = make_scoped_ptr( |
new TextureMailboxDeleter(base::MessageLoopProxy::current())); |
@@ -162,13 +166,15 @@ void PixelTest::SetUpSoftwareRenderer() { |
output_surface_.reset(new PixelTestOutputSurface(device.Pass())); |
output_surface_->BindToClient(output_surface_client_.get()); |
shared_bitmap_manager_.reset(new TestSharedBitmapManager()); |
- resource_provider_ = ResourceProvider::Create(output_surface_.get(), |
- shared_bitmap_manager_.get(), |
- main_thread_task_runner_.get(), |
- 0, |
- false, |
- 1, |
- false); |
+ resource_provider_ = |
+ ResourceProvider::Create(output_surface_.get(), |
+ shared_bitmap_manager_.get(), |
+ gpu_memory_buffer_manager_.get(), |
+ main_thread_task_runner_.get(), |
+ 0, |
+ false, |
+ 1, |
+ false); |
renderer_ = SoftwareRenderer::Create( |
this, &settings_, output_surface_.get(), resource_provider_.get()); |
} |