OLD | NEW |
1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "cc/test/pixel_test.h" | 5 #include "cc/test/pixel_test.h" |
6 | 6 |
7 #include "base/command_line.h" | 7 #include "base/command_line.h" |
8 #include "base/message_loop/message_loop_proxy.h" | 8 #include "base/message_loop/message_loop_proxy.h" |
9 #include "base/path_service.h" | 9 #include "base/path_service.h" |
10 #include "base/run_loop.h" | 10 #include "base/run_loop.h" |
(...skipping 15 matching lines...) Expand all Loading... |
26 #include "cc/test/test_in_process_context_provider.h" | 26 #include "cc/test/test_in_process_context_provider.h" |
27 #include "cc/test/test_shared_bitmap_manager.h" | 27 #include "cc/test/test_shared_bitmap_manager.h" |
28 #include "gpu/command_buffer/client/gles2_interface.h" | 28 #include "gpu/command_buffer/client/gles2_interface.h" |
29 #include "testing/gtest/include/gtest/gtest.h" | 29 #include "testing/gtest/include/gtest/gtest.h" |
30 | 30 |
31 namespace cc { | 31 namespace cc { |
32 | 32 |
33 PixelTest::PixelTest() | 33 PixelTest::PixelTest() |
34 : device_viewport_size_(gfx::Size(200, 200)), | 34 : device_viewport_size_(gfx::Size(200, 200)), |
35 disable_picture_quad_image_filtering_(false), | 35 disable_picture_quad_image_filtering_(false), |
36 output_surface_client_(new FakeOutputSurfaceClient) {} | 36 output_surface_client_(new FakeOutputSurfaceClient), |
37 | 37 main_thread_task_runner_( |
| 38 BlockingTaskRunner::Create(base::MessageLoopProxy::current())) { |
| 39 } |
38 PixelTest::~PixelTest() {} | 40 PixelTest::~PixelTest() {} |
39 | 41 |
40 bool PixelTest::RunPixelTest(RenderPassList* pass_list, | 42 bool PixelTest::RunPixelTest(RenderPassList* pass_list, |
41 const base::FilePath& ref_file, | 43 const base::FilePath& ref_file, |
42 const PixelComparator& comparator) { | 44 const PixelComparator& comparator) { |
43 return RunPixelTestWithReadbackTarget(pass_list, | 45 return RunPixelTestWithReadbackTarget(pass_list, |
44 pass_list->back(), | 46 pass_list->back(), |
45 ref_file, | 47 ref_file, |
46 comparator); | 48 comparator); |
47 } | 49 } |
(...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
105 } | 107 } |
106 | 108 |
107 void PixelTest::SetUpGLRenderer(bool use_skia_gpu_backend) { | 109 void PixelTest::SetUpGLRenderer(bool use_skia_gpu_backend) { |
108 enable_pixel_output_.reset(new gfx::DisableNullDrawGLBindings); | 110 enable_pixel_output_.reset(new gfx::DisableNullDrawGLBindings); |
109 | 111 |
110 output_surface_.reset( | 112 output_surface_.reset( |
111 new PixelTestOutputSurface(new TestInProcessContextProvider)); | 113 new PixelTestOutputSurface(new TestInProcessContextProvider)); |
112 output_surface_->BindToClient(output_surface_client_.get()); | 114 output_surface_->BindToClient(output_surface_client_.get()); |
113 | 115 |
114 shared_bitmap_manager_.reset(new TestSharedBitmapManager()); | 116 shared_bitmap_manager_.reset(new TestSharedBitmapManager()); |
115 resource_provider_ = ResourceProvider::Create( | 117 resource_provider_ = ResourceProvider::Create(output_surface_.get(), |
116 output_surface_.get(), shared_bitmap_manager_.get(), 0, false, 1, false); | 118 shared_bitmap_manager_.get(), |
| 119 main_thread_task_runner_, |
| 120 0, |
| 121 false, |
| 122 1, |
| 123 false); |
117 | 124 |
118 texture_mailbox_deleter_ = make_scoped_ptr( | 125 texture_mailbox_deleter_ = make_scoped_ptr( |
119 new TextureMailboxDeleter(base::MessageLoopProxy::current())); | 126 new TextureMailboxDeleter(base::MessageLoopProxy::current())); |
120 | 127 |
121 renderer_ = GLRenderer::Create(this, | 128 renderer_ = GLRenderer::Create(this, |
122 &settings_, | 129 &settings_, |
123 output_surface_.get(), | 130 output_surface_.get(), |
124 resource_provider_.get(), | 131 resource_provider_.get(), |
125 texture_mailbox_deleter_.get(), | 132 texture_mailbox_deleter_.get(), |
126 0).PassAs<DirectRenderer>(); | 133 0).PassAs<DirectRenderer>(); |
(...skipping 20 matching lines...) Expand all Loading... |
147 void PixelTest::EnableExternalStencilTest() { | 154 void PixelTest::EnableExternalStencilTest() { |
148 static_cast<PixelTestOutputSurface*>(output_surface_.get()) | 155 static_cast<PixelTestOutputSurface*>(output_surface_.get()) |
149 ->set_has_external_stencil_test(true); | 156 ->set_has_external_stencil_test(true); |
150 } | 157 } |
151 | 158 |
152 void PixelTest::SetUpSoftwareRenderer() { | 159 void PixelTest::SetUpSoftwareRenderer() { |
153 scoped_ptr<SoftwareOutputDevice> device(new PixelTestSoftwareOutputDevice()); | 160 scoped_ptr<SoftwareOutputDevice> device(new PixelTestSoftwareOutputDevice()); |
154 output_surface_.reset(new PixelTestOutputSurface(device.Pass())); | 161 output_surface_.reset(new PixelTestOutputSurface(device.Pass())); |
155 output_surface_->BindToClient(output_surface_client_.get()); | 162 output_surface_->BindToClient(output_surface_client_.get()); |
156 shared_bitmap_manager_.reset(new TestSharedBitmapManager()); | 163 shared_bitmap_manager_.reset(new TestSharedBitmapManager()); |
157 resource_provider_ = ResourceProvider::Create( | 164 resource_provider_ = ResourceProvider::Create(output_surface_.get(), |
158 output_surface_.get(), shared_bitmap_manager_.get(), 0, false, 1, false); | 165 shared_bitmap_manager_.get(), |
| 166 main_thread_task_runner_, |
| 167 0, |
| 168 false, |
| 169 1, |
| 170 false); |
159 renderer_ = | 171 renderer_ = |
160 SoftwareRenderer::Create( | 172 SoftwareRenderer::Create( |
161 this, &settings_, output_surface_.get(), resource_provider_.get()) | 173 this, &settings_, output_surface_.get(), resource_provider_.get()) |
162 .PassAs<DirectRenderer>(); | 174 .PassAs<DirectRenderer>(); |
163 } | 175 } |
164 | 176 |
165 } // namespace cc | 177 } // namespace cc |
OLD | NEW |