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/path_service.h" | 7 #include "base/path_service.h" |
8 #include "base/run_loop.h" | 8 #include "base/run_loop.h" |
9 #include "cc/output/compositor_frame_metadata.h" | 9 #include "cc/output/compositor_frame_metadata.h" |
10 #include "cc/output/copy_output_request.h" | 10 #include "cc/output/copy_output_request.h" |
(...skipping 143 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
154 | 154 |
155 void PixelTest::SetUpGLRenderer(bool use_skia_gpu_backend) { | 155 void PixelTest::SetUpGLRenderer(bool use_skia_gpu_backend) { |
156 CHECK(fake_client_); | 156 CHECK(fake_client_); |
157 CHECK(gfx::InitializeGLBindings(gfx::kGLImplementationOSMesaGL)); | 157 CHECK(gfx::InitializeGLBindings(gfx::kGLImplementationOSMesaGL)); |
158 | 158 |
159 using webkit::gpu::ContextProviderInProcess; | 159 using webkit::gpu::ContextProviderInProcess; |
160 output_surface_.reset(new PixelTestOutputSurface( | 160 output_surface_.reset(new PixelTestOutputSurface( |
161 ContextProviderInProcess::CreateOffscreen())); | 161 ContextProviderInProcess::CreateOffscreen())); |
162 output_surface_->BindToClient(fake_client_.get()); | 162 output_surface_->BindToClient(fake_client_.get()); |
163 | 163 |
164 resource_provider_ = ResourceProvider::Create(output_surface_.get(), 0); | 164 resource_provider_ = |
| 165 ResourceProvider::Create(output_surface_.get(), 0, false); |
165 | 166 |
166 texture_mailbox_deleter_ = make_scoped_ptr(new TextureMailboxDeleter); | 167 texture_mailbox_deleter_ = make_scoped_ptr(new TextureMailboxDeleter); |
167 | 168 |
168 renderer_ = GLRenderer::Create(fake_client_.get(), | 169 renderer_ = GLRenderer::Create(fake_client_.get(), |
169 &settings_, | 170 &settings_, |
170 output_surface_.get(), | 171 output_surface_.get(), |
171 resource_provider_.get(), | 172 resource_provider_.get(), |
172 texture_mailbox_deleter_.get(), | 173 texture_mailbox_deleter_.get(), |
173 0, | 174 0, |
174 use_skia_gpu_backend).PassAs<DirectRenderer>(); | 175 use_skia_gpu_backend).PassAs<DirectRenderer>(); |
(...skipping 21 matching lines...) Expand all Loading... |
196 static_cast<PixelTestOutputSurface*>(output_surface_.get()) | 197 static_cast<PixelTestOutputSurface*>(output_surface_.get()) |
197 ->set_has_external_stencil_test(true); | 198 ->set_has_external_stencil_test(true); |
198 } | 199 } |
199 | 200 |
200 void PixelTest::SetUpSoftwareRenderer() { | 201 void PixelTest::SetUpSoftwareRenderer() { |
201 CHECK(fake_client_); | 202 CHECK(fake_client_); |
202 | 203 |
203 scoped_ptr<SoftwareOutputDevice> device(new PixelTestSoftwareOutputDevice()); | 204 scoped_ptr<SoftwareOutputDevice> device(new PixelTestSoftwareOutputDevice()); |
204 output_surface_.reset(new PixelTestOutputSurface(device.Pass())); | 205 output_surface_.reset(new PixelTestOutputSurface(device.Pass())); |
205 output_surface_->BindToClient(fake_client_.get()); | 206 output_surface_->BindToClient(fake_client_.get()); |
206 resource_provider_ = ResourceProvider::Create(output_surface_.get(), 0); | 207 resource_provider_ = |
| 208 ResourceProvider::Create(output_surface_.get(), 0, false); |
207 renderer_ = SoftwareRenderer::Create(fake_client_.get(), | 209 renderer_ = SoftwareRenderer::Create(fake_client_.get(), |
208 &settings_, | 210 &settings_, |
209 output_surface_.get(), | 211 output_surface_.get(), |
210 resource_provider_.get()) | 212 resource_provider_.get()) |
211 .PassAs<DirectRenderer>(); | 213 .PassAs<DirectRenderer>(); |
212 } | 214 } |
213 | 215 |
214 } // namespace cc | 216 } // namespace cc |
OLD | NEW |