| Index: cc/test/pixel_test.cc
|
| diff --git a/cc/test/pixel_test.cc b/cc/test/pixel_test.cc
|
| index d7d3c15e9ff9fdac5aec6ce9f2fd1ba360703ec2..de02e5b7ed732ad4bbc8362aba4b0867d5544935 100644
|
| --- a/cc/test/pixel_test.cc
|
| +++ b/cc/test/pixel_test.cc
|
| @@ -25,6 +25,7 @@
|
| #include "cc/test/pixel_test_utils.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"
|
| #include "gpu/command_buffer/client/gles2_interface.h"
|
| #include "testing/gtest/include/gtest/gtest.h"
|
|
|
| @@ -33,8 +34,10 @@ namespace cc {
|
| PixelTest::PixelTest()
|
| : device_viewport_size_(gfx::Size(200, 200)),
|
| disable_picture_quad_image_filtering_(false),
|
| - output_surface_client_(new FakeOutputSurfaceClient) {}
|
| -
|
| + output_surface_client_(new FakeOutputSurfaceClient),
|
| + main_thread_task_runner_(
|
| + BlockingTaskRunner::Create(base::MessageLoopProxy::current())) {
|
| +}
|
| PixelTest::~PixelTest() {}
|
|
|
| bool PixelTest::RunPixelTest(RenderPassList* pass_list,
|
| @@ -112,8 +115,13 @@ void PixelTest::SetUpGLRenderer(bool use_skia_gpu_backend) {
|
| output_surface_->BindToClient(output_surface_client_.get());
|
|
|
| shared_bitmap_manager_.reset(new TestSharedBitmapManager());
|
| - resource_provider_ = ResourceProvider::Create(
|
| - output_surface_.get(), shared_bitmap_manager_.get(), 0, false, 1, false);
|
| + resource_provider_ = ResourceProvider::Create(output_surface_.get(),
|
| + shared_bitmap_manager_.get(),
|
| + main_thread_task_runner_.get(),
|
| + 0,
|
| + false,
|
| + 1,
|
| + false);
|
|
|
| texture_mailbox_deleter_ = make_scoped_ptr(
|
| new TextureMailboxDeleter(base::MessageLoopProxy::current()));
|
| @@ -154,8 +162,13 @@ 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(), 0, false, 1, false);
|
| + resource_provider_ = ResourceProvider::Create(output_surface_.get(),
|
| + shared_bitmap_manager_.get(),
|
| + main_thread_task_runner_.get(),
|
| + 0,
|
| + false,
|
| + 1,
|
| + false);
|
| renderer_ =
|
| SoftwareRenderer::Create(
|
| this, &settings_, output_surface_.get(), resource_provider_.get())
|
|
|