| 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/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" |
| (...skipping 115 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 126 bool flipped_output_surface) { | 126 bool flipped_output_surface) { |
| 127 enable_pixel_output_.reset(new gfx::DisableNullDrawGLBindings); | 127 enable_pixel_output_.reset(new gfx::DisableNullDrawGLBindings); |
| 128 | 128 |
| 129 output_surface_.reset(new PixelTestOutputSurface( | 129 output_surface_.reset(new PixelTestOutputSurface( |
| 130 new TestInProcessContextProvider, new TestInProcessContextProvider, | 130 new TestInProcessContextProvider, new TestInProcessContextProvider, |
| 131 flipped_output_surface)); | 131 flipped_output_surface)); |
| 132 output_surface_->BindToClient(output_surface_client_.get()); | 132 output_surface_->BindToClient(output_surface_client_.get()); |
| 133 | 133 |
| 134 shared_bitmap_manager_.reset(new TestSharedBitmapManager); | 134 shared_bitmap_manager_.reset(new TestSharedBitmapManager); |
| 135 gpu_memory_buffer_manager_.reset(new TestGpuMemoryBufferManager); | 135 gpu_memory_buffer_manager_.reset(new TestGpuMemoryBufferManager); |
| 136 resource_provider_ = | 136 resource_provider_ = ResourceProvider::Create( |
| 137 ResourceProvider::Create(output_surface_.get(), | 137 output_surface_.get(), shared_bitmap_manager_.get(), |
| 138 shared_bitmap_manager_.get(), | 138 gpu_memory_buffer_manager_.get(), main_thread_task_runner_.get(), 0, |
| 139 gpu_memory_buffer_manager_.get(), | 139 false, 1, false); |
| 140 main_thread_task_runner_.get(), | |
| 141 0, | |
| 142 false, | |
| 143 1); | |
| 144 | 140 |
| 145 texture_mailbox_deleter_ = make_scoped_ptr( | 141 texture_mailbox_deleter_ = make_scoped_ptr( |
| 146 new TextureMailboxDeleter(base::ThreadTaskRunnerHandle::Get())); | 142 new TextureMailboxDeleter(base::ThreadTaskRunnerHandle::Get())); |
| 147 | 143 |
| 148 renderer_ = GLRenderer::Create( | 144 renderer_ = GLRenderer::Create( |
| 149 this, &settings_.renderer_settings, output_surface_.get(), | 145 this, &settings_.renderer_settings, output_surface_.get(), |
| 150 resource_provider_.get(), texture_mailbox_deleter_.get(), 0); | 146 resource_provider_.get(), texture_mailbox_deleter_.get(), 0); |
| 151 } | 147 } |
| 152 | 148 |
| 153 void PixelTest::ForceExpandedViewport(const gfx::Size& surface_expansion) { | 149 void PixelTest::ForceExpandedViewport(const gfx::Size& surface_expansion) { |
| (...skipping 17 matching lines...) Expand all Loading... |
| 171 void PixelTest::EnableExternalStencilTest() { | 167 void PixelTest::EnableExternalStencilTest() { |
| 172 static_cast<PixelTestOutputSurface*>(output_surface_.get()) | 168 static_cast<PixelTestOutputSurface*>(output_surface_.get()) |
| 173 ->set_has_external_stencil_test(true); | 169 ->set_has_external_stencil_test(true); |
| 174 } | 170 } |
| 175 | 171 |
| 176 void PixelTest::SetUpSoftwareRenderer() { | 172 void PixelTest::SetUpSoftwareRenderer() { |
| 177 scoped_ptr<SoftwareOutputDevice> device(new PixelTestSoftwareOutputDevice()); | 173 scoped_ptr<SoftwareOutputDevice> device(new PixelTestSoftwareOutputDevice()); |
| 178 output_surface_.reset(new PixelTestOutputSurface(device.Pass())); | 174 output_surface_.reset(new PixelTestOutputSurface(device.Pass())); |
| 179 output_surface_->BindToClient(output_surface_client_.get()); | 175 output_surface_->BindToClient(output_surface_client_.get()); |
| 180 shared_bitmap_manager_.reset(new TestSharedBitmapManager()); | 176 shared_bitmap_manager_.reset(new TestSharedBitmapManager()); |
| 181 resource_provider_ = | 177 resource_provider_ = ResourceProvider::Create( |
| 182 ResourceProvider::Create(output_surface_.get(), | 178 output_surface_.get(), shared_bitmap_manager_.get(), |
| 183 shared_bitmap_manager_.get(), | 179 gpu_memory_buffer_manager_.get(), main_thread_task_runner_.get(), 0, |
| 184 gpu_memory_buffer_manager_.get(), | 180 false, 1, false); |
| 185 main_thread_task_runner_.get(), | |
| 186 0, | |
| 187 false, | |
| 188 1); | |
| 189 renderer_ = | 181 renderer_ = |
| 190 SoftwareRenderer::Create(this, &settings_.renderer_settings, | 182 SoftwareRenderer::Create(this, &settings_.renderer_settings, |
| 191 output_surface_.get(), resource_provider_.get()); | 183 output_surface_.get(), resource_provider_.get()); |
| 192 } | 184 } |
| 193 | 185 |
| 194 } // namespace cc | 186 } // namespace cc |
| OLD | NEW |