Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(233)

Side by Side Diff: cc/test/pixel_test.cc

Issue 485043003: cc: Use correct message loop proxy in BlockingTaskRunner (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Nits. Created 6 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « cc/test/pixel_test.h ('k') | cc/test/render_pass_test_common.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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"
11 #include "cc/base/switches.h" 11 #include "cc/base/switches.h"
12 #include "cc/output/compositor_frame_metadata.h" 12 #include "cc/output/compositor_frame_metadata.h"
13 #include "cc/output/copy_output_request.h" 13 #include "cc/output/copy_output_request.h"
14 #include "cc/output/copy_output_result.h" 14 #include "cc/output/copy_output_result.h"
15 #include "cc/output/gl_renderer.h" 15 #include "cc/output/gl_renderer.h"
16 #include "cc/output/output_surface_client.h" 16 #include "cc/output/output_surface_client.h"
17 #include "cc/output/software_renderer.h" 17 #include "cc/output/software_renderer.h"
18 #include "cc/resources/raster_worker_pool.h" 18 #include "cc/resources/raster_worker_pool.h"
19 #include "cc/resources/resource_provider.h" 19 #include "cc/resources/resource_provider.h"
20 #include "cc/resources/texture_mailbox_deleter.h" 20 #include "cc/resources/texture_mailbox_deleter.h"
21 #include "cc/test/fake_output_surface_client.h" 21 #include "cc/test/fake_output_surface_client.h"
22 #include "cc/test/paths.h" 22 #include "cc/test/paths.h"
23 #include "cc/test/pixel_test_output_surface.h" 23 #include "cc/test/pixel_test_output_surface.h"
24 #include "cc/test/pixel_test_software_output_device.h" 24 #include "cc/test/pixel_test_software_output_device.h"
25 #include "cc/test/pixel_test_utils.h" 25 #include "cc/test/pixel_test_utils.h"
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 "cc/trees/blocking_task_runner.h"
28 #include "gpu/command_buffer/client/gles2_interface.h" 29 #include "gpu/command_buffer/client/gles2_interface.h"
29 #include "testing/gtest/include/gtest/gtest.h" 30 #include "testing/gtest/include/gtest/gtest.h"
30 31
31 namespace cc { 32 namespace cc {
32 33
33 PixelTest::PixelTest() 34 PixelTest::PixelTest()
34 : device_viewport_size_(gfx::Size(200, 200)), 35 : device_viewport_size_(gfx::Size(200, 200)),
35 disable_picture_quad_image_filtering_(false), 36 disable_picture_quad_image_filtering_(false),
36 output_surface_client_(new FakeOutputSurfaceClient) {} 37 output_surface_client_(new FakeOutputSurfaceClient),
37 38 main_thread_task_runner_(
39 BlockingTaskRunner::Create(base::MessageLoopProxy::current())) {
40 }
38 PixelTest::~PixelTest() {} 41 PixelTest::~PixelTest() {}
39 42
40 bool PixelTest::RunPixelTest(RenderPassList* pass_list, 43 bool PixelTest::RunPixelTest(RenderPassList* pass_list,
41 const base::FilePath& ref_file, 44 const base::FilePath& ref_file,
42 const PixelComparator& comparator) { 45 const PixelComparator& comparator) {
43 return RunPixelTestWithReadbackTarget(pass_list, 46 return RunPixelTestWithReadbackTarget(pass_list,
44 pass_list->back(), 47 pass_list->back(),
45 ref_file, 48 ref_file,
46 comparator); 49 comparator);
47 } 50 }
(...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after
105 } 108 }
106 109
107 void PixelTest::SetUpGLRenderer(bool use_skia_gpu_backend) { 110 void PixelTest::SetUpGLRenderer(bool use_skia_gpu_backend) {
108 enable_pixel_output_.reset(new gfx::DisableNullDrawGLBindings); 111 enable_pixel_output_.reset(new gfx::DisableNullDrawGLBindings);
109 112
110 output_surface_.reset( 113 output_surface_.reset(
111 new PixelTestOutputSurface(new TestInProcessContextProvider)); 114 new PixelTestOutputSurface(new TestInProcessContextProvider));
112 output_surface_->BindToClient(output_surface_client_.get()); 115 output_surface_->BindToClient(output_surface_client_.get());
113 116
114 shared_bitmap_manager_.reset(new TestSharedBitmapManager()); 117 shared_bitmap_manager_.reset(new TestSharedBitmapManager());
115 resource_provider_ = ResourceProvider::Create( 118 resource_provider_ = ResourceProvider::Create(output_surface_.get(),
116 output_surface_.get(), shared_bitmap_manager_.get(), 0, false, 1, false); 119 shared_bitmap_manager_.get(),
120 main_thread_task_runner_.get(),
121 0,
122 false,
123 1,
124 false);
117 125
118 texture_mailbox_deleter_ = make_scoped_ptr( 126 texture_mailbox_deleter_ = make_scoped_ptr(
119 new TextureMailboxDeleter(base::MessageLoopProxy::current())); 127 new TextureMailboxDeleter(base::MessageLoopProxy::current()));
120 128
121 renderer_ = GLRenderer::Create(this, 129 renderer_ = GLRenderer::Create(this,
122 &settings_, 130 &settings_,
123 output_surface_.get(), 131 output_surface_.get(),
124 resource_provider_.get(), 132 resource_provider_.get(),
125 texture_mailbox_deleter_.get(), 133 texture_mailbox_deleter_.get(),
126 0).PassAs<DirectRenderer>(); 134 0).PassAs<DirectRenderer>();
(...skipping 20 matching lines...) Expand all
147 void PixelTest::EnableExternalStencilTest() { 155 void PixelTest::EnableExternalStencilTest() {
148 static_cast<PixelTestOutputSurface*>(output_surface_.get()) 156 static_cast<PixelTestOutputSurface*>(output_surface_.get())
149 ->set_has_external_stencil_test(true); 157 ->set_has_external_stencil_test(true);
150 } 158 }
151 159
152 void PixelTest::SetUpSoftwareRenderer() { 160 void PixelTest::SetUpSoftwareRenderer() {
153 scoped_ptr<SoftwareOutputDevice> device(new PixelTestSoftwareOutputDevice()); 161 scoped_ptr<SoftwareOutputDevice> device(new PixelTestSoftwareOutputDevice());
154 output_surface_.reset(new PixelTestOutputSurface(device.Pass())); 162 output_surface_.reset(new PixelTestOutputSurface(device.Pass()));
155 output_surface_->BindToClient(output_surface_client_.get()); 163 output_surface_->BindToClient(output_surface_client_.get());
156 shared_bitmap_manager_.reset(new TestSharedBitmapManager()); 164 shared_bitmap_manager_.reset(new TestSharedBitmapManager());
157 resource_provider_ = ResourceProvider::Create( 165 resource_provider_ = ResourceProvider::Create(output_surface_.get(),
158 output_surface_.get(), shared_bitmap_manager_.get(), 0, false, 1, false); 166 shared_bitmap_manager_.get(),
167 main_thread_task_runner_.get(),
168 0,
169 false,
170 1,
171 false);
159 renderer_ = 172 renderer_ =
160 SoftwareRenderer::Create( 173 SoftwareRenderer::Create(
161 this, &settings_, output_surface_.get(), resource_provider_.get()) 174 this, &settings_, output_surface_.get(), resource_provider_.get())
162 .PassAs<DirectRenderer>(); 175 .PassAs<DirectRenderer>();
163 } 176 }
164 177
165 } // namespace cc 178 } // namespace cc
OLDNEW
« no previous file with comments | « cc/test/pixel_test.h ('k') | cc/test/render_pass_test_common.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698