| 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 147 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 158 void PixelTest::SetUpGLRenderer(bool use_skia_gpu_backend) { | 158 void PixelTest::SetUpGLRenderer(bool use_skia_gpu_backend) { |
| 159 CHECK(fake_client_); | 159 CHECK(fake_client_); |
| 160 CHECK(gfx::InitializeGLBindings(gfx::kGLImplementationOSMesaGL)); | 160 CHECK(gfx::InitializeGLBindings(gfx::kGLImplementationOSMesaGL)); |
| 161 | 161 |
| 162 using webkit::gpu::ContextProviderInProcess; | 162 using webkit::gpu::ContextProviderInProcess; |
| 163 output_surface_.reset(new PixelTestOutputSurface( | 163 output_surface_.reset(new PixelTestOutputSurface( |
| 164 ContextProviderInProcess::CreateOffscreen())); | 164 ContextProviderInProcess::CreateOffscreen())); |
| 165 output_surface_->BindToClient(fake_client_.get()); | 165 output_surface_->BindToClient(fake_client_.get()); |
| 166 | 166 |
| 167 resource_provider_ = | 167 resource_provider_ = |
| 168 ResourceProvider::Create(output_surface_.get(), NULL, 0, false); | 168 ResourceProvider::Create(output_surface_.get(), NULL, 0, false, 1); |
| 169 | 169 |
| 170 texture_mailbox_deleter_ = make_scoped_ptr(new TextureMailboxDeleter); | 170 texture_mailbox_deleter_ = make_scoped_ptr(new TextureMailboxDeleter); |
| 171 | 171 |
| 172 renderer_ = GLRenderer::Create(fake_client_.get(), | 172 renderer_ = GLRenderer::Create(fake_client_.get(), |
| 173 &settings_, | 173 &settings_, |
| 174 output_surface_.get(), | 174 output_surface_.get(), |
| 175 resource_provider_.get(), | 175 resource_provider_.get(), |
| 176 texture_mailbox_deleter_.get(), | 176 texture_mailbox_deleter_.get(), |
| 177 0, | 177 0, |
| 178 use_skia_gpu_backend).PassAs<DirectRenderer>(); | 178 use_skia_gpu_backend).PassAs<DirectRenderer>(); |
| (...skipping 22 matching lines...) Expand all Loading... |
| 201 ->set_has_external_stencil_test(true); | 201 ->set_has_external_stencil_test(true); |
| 202 } | 202 } |
| 203 | 203 |
| 204 void PixelTest::SetUpSoftwareRenderer() { | 204 void PixelTest::SetUpSoftwareRenderer() { |
| 205 CHECK(fake_client_); | 205 CHECK(fake_client_); |
| 206 | 206 |
| 207 scoped_ptr<SoftwareOutputDevice> device(new PixelTestSoftwareOutputDevice()); | 207 scoped_ptr<SoftwareOutputDevice> device(new PixelTestSoftwareOutputDevice()); |
| 208 output_surface_.reset(new PixelTestOutputSurface(device.Pass())); | 208 output_surface_.reset(new PixelTestOutputSurface(device.Pass())); |
| 209 output_surface_->BindToClient(fake_client_.get()); | 209 output_surface_->BindToClient(fake_client_.get()); |
| 210 resource_provider_ = | 210 resource_provider_ = |
| 211 ResourceProvider::Create(output_surface_.get(), NULL, 0, false); | 211 ResourceProvider::Create(output_surface_.get(), NULL, 0, false, 1); |
| 212 renderer_ = SoftwareRenderer::Create(fake_client_.get(), | 212 renderer_ = SoftwareRenderer::Create(fake_client_.get(), |
| 213 &settings_, | 213 &settings_, |
| 214 output_surface_.get(), | 214 output_surface_.get(), |
| 215 resource_provider_.get()) | 215 resource_provider_.get()) |
| 216 .PassAs<DirectRenderer>(); | 216 .PassAs<DirectRenderer>(); |
| 217 } | 217 } |
| 218 | 218 |
| 219 } // namespace cc | 219 } // namespace cc |
| OLD | NEW |