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

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

Issue 1821863002: Hook up ui::Compositor to Display's BeginFrameSource (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Really revert task runner changes Created 4 years, 8 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
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/path_service.h" 8 #include "base/path_service.h"
9 #include "base/run_loop.h" 9 #include "base/run_loop.h"
10 #include "base/thread_task_runner_handle.h" 10 #include "base/thread_task_runner_handle.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/output/texture_mailbox_deleter.h" 18 #include "cc/output/texture_mailbox_deleter.h"
19 #include "cc/raster/tile_task_worker_pool.h" 19 #include "cc/raster/tile_task_worker_pool.h"
20 #include "cc/resources/resource_provider.h" 20 #include "cc/resources/resource_provider.h"
21 #include "cc/scheduler/begin_frame_source.h"
21 #include "cc/test/fake_output_surface_client.h" 22 #include "cc/test/fake_output_surface_client.h"
22 #include "cc/test/paths.h" 23 #include "cc/test/paths.h"
23 #include "cc/test/pixel_test_output_surface.h" 24 #include "cc/test/pixel_test_output_surface.h"
24 #include "cc/test/pixel_test_software_output_device.h" 25 #include "cc/test/pixel_test_software_output_device.h"
25 #include "cc/test/pixel_test_utils.h" 26 #include "cc/test/pixel_test_utils.h"
26 #include "cc/test/test_gpu_memory_buffer_manager.h" 27 #include "cc/test/test_gpu_memory_buffer_manager.h"
27 #include "cc/test/test_in_process_context_provider.h" 28 #include "cc/test/test_in_process_context_provider.h"
28 #include "cc/test/test_shared_bitmap_manager.h" 29 #include "cc/test/test_shared_bitmap_manager.h"
29 #include "cc/trees/blocking_task_runner.h" 30 #include "cc/trees/blocking_task_runner.h"
30 #include "gpu/command_buffer/client/gles2_interface.h" 31 #include "gpu/command_buffer/client/gles2_interface.h"
(...skipping 88 matching lines...) Expand 10 before | Expand all | Expand 10 after
119 return MatchesPNGFile( 120 return MatchesPNGFile(
120 *result_bitmap_, test_data_dir.Append(ref_file), comparator); 121 *result_bitmap_, test_data_dir.Append(ref_file), comparator);
121 } 122 }
122 123
123 void PixelTest::SetUpGLRenderer(bool use_skia_gpu_backend, 124 void PixelTest::SetUpGLRenderer(bool use_skia_gpu_backend,
124 bool flipped_output_surface) { 125 bool flipped_output_surface) {
125 enable_pixel_output_.reset(new gfx::DisableNullDrawGLBindings); 126 enable_pixel_output_.reset(new gfx::DisableNullDrawGLBindings);
126 127
127 output_surface_.reset(new PixelTestOutputSurface( 128 output_surface_.reset(new PixelTestOutputSurface(
128 new TestInProcessContextProvider, new TestInProcessContextProvider, 129 new TestInProcessContextProvider, new TestInProcessContextProvider,
129 flipped_output_surface)); 130 flipped_output_surface, nullptr));
130 output_surface_->BindToClient(output_surface_client_.get()); 131 output_surface_->BindToClient(output_surface_client_.get());
131 132
132 shared_bitmap_manager_.reset(new TestSharedBitmapManager); 133 shared_bitmap_manager_.reset(new TestSharedBitmapManager);
133 gpu_memory_buffer_manager_.reset(new TestGpuMemoryBufferManager); 134 gpu_memory_buffer_manager_.reset(new TestGpuMemoryBufferManager);
134 resource_provider_ = ResourceProvider::Create( 135 resource_provider_ = ResourceProvider::Create(
135 output_surface_.get(), shared_bitmap_manager_.get(), 136 output_surface_.get(), shared_bitmap_manager_.get(),
136 gpu_memory_buffer_manager_.get(), main_thread_task_runner_.get(), 0, 1, 137 gpu_memory_buffer_manager_.get(), main_thread_task_runner_.get(), 0, 1,
137 settings_.renderer_settings.use_gpu_memory_buffer_resources, 138 settings_.renderer_settings.use_gpu_memory_buffer_resources,
138 settings_.use_image_texture_targets); 139 settings_.use_image_texture_targets);
139 140
(...skipping 23 matching lines...) Expand all
163 external_device_clip_rect_ = clip; 164 external_device_clip_rect_ = clip;
164 } 165 }
165 166
166 void PixelTest::EnableExternalStencilTest() { 167 void PixelTest::EnableExternalStencilTest() {
167 static_cast<PixelTestOutputSurface*>(output_surface_.get()) 168 static_cast<PixelTestOutputSurface*>(output_surface_.get())
168 ->set_has_external_stencil_test(true); 169 ->set_has_external_stencil_test(true);
169 } 170 }
170 171
171 void PixelTest::SetUpSoftwareRenderer() { 172 void PixelTest::SetUpSoftwareRenderer() {
172 scoped_ptr<SoftwareOutputDevice> device(new PixelTestSoftwareOutputDevice()); 173 scoped_ptr<SoftwareOutputDevice> device(new PixelTestSoftwareOutputDevice());
173 output_surface_.reset(new PixelTestOutputSurface(std::move(device))); 174 output_surface_.reset(new PixelTestOutputSurface(std::move(device), nullptr));
174 output_surface_->BindToClient(output_surface_client_.get()); 175 output_surface_->BindToClient(output_surface_client_.get());
175 shared_bitmap_manager_.reset(new TestSharedBitmapManager()); 176 shared_bitmap_manager_.reset(new TestSharedBitmapManager());
176 resource_provider_ = ResourceProvider::Create( 177 resource_provider_ = ResourceProvider::Create(
177 output_surface_.get(), shared_bitmap_manager_.get(), 178 output_surface_.get(), shared_bitmap_manager_.get(),
178 gpu_memory_buffer_manager_.get(), main_thread_task_runner_.get(), 0, 1, 179 gpu_memory_buffer_manager_.get(), main_thread_task_runner_.get(), 0, 1,
179 settings_.renderer_settings.use_gpu_memory_buffer_resources, 180 settings_.renderer_settings.use_gpu_memory_buffer_resources,
180 settings_.use_image_texture_targets); 181 settings_.use_image_texture_targets);
181 renderer_ = 182 renderer_ =
182 SoftwareRenderer::Create(this, &settings_.renderer_settings, 183 SoftwareRenderer::Create(this, &settings_.renderer_settings,
183 output_surface_.get(), resource_provider_.get()); 184 output_surface_.get(), resource_provider_.get());
184 } 185 }
185 186
186 } // namespace cc 187 } // namespace cc
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698