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 118 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
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_ = ResourceProvider::Create( | 136 resource_provider_ = ResourceProvider::Create( |
137 output_surface_.get(), shared_bitmap_manager_.get(), | 137 output_surface_.get(), shared_bitmap_manager_.get(), |
138 gpu_memory_buffer_manager_.get(), main_thread_task_runner_.get(), 0, | 138 gpu_memory_buffer_manager_.get(), main_thread_task_runner_.get(), 0, |
139 false, 1); | 139 false, 1, false); |
140 | 140 |
141 texture_mailbox_deleter_ = make_scoped_ptr( | 141 texture_mailbox_deleter_ = make_scoped_ptr( |
142 new TextureMailboxDeleter(base::ThreadTaskRunnerHandle::Get())); | 142 new TextureMailboxDeleter(base::ThreadTaskRunnerHandle::Get())); |
143 | 143 |
144 renderer_ = GLRenderer::Create( | 144 renderer_ = GLRenderer::Create( |
145 this, &settings_.renderer_settings, output_surface_.get(), | 145 this, &settings_.renderer_settings, output_surface_.get(), |
146 resource_provider_.get(), texture_mailbox_deleter_.get(), 0); | 146 resource_provider_.get(), texture_mailbox_deleter_.get(), 0); |
147 } | 147 } |
148 | 148 |
149 void PixelTest::ForceExpandedViewport(const gfx::Size& surface_expansion) { | 149 void PixelTest::ForceExpandedViewport(const gfx::Size& surface_expansion) { |
(...skipping 20 matching lines...) Expand all Loading... |
170 } | 170 } |
171 | 171 |
172 void PixelTest::SetUpSoftwareRenderer() { | 172 void PixelTest::SetUpSoftwareRenderer() { |
173 scoped_ptr<SoftwareOutputDevice> device(new PixelTestSoftwareOutputDevice()); | 173 scoped_ptr<SoftwareOutputDevice> device(new PixelTestSoftwareOutputDevice()); |
174 output_surface_.reset(new PixelTestOutputSurface(device.Pass())); | 174 output_surface_.reset(new PixelTestOutputSurface(device.Pass())); |
175 output_surface_->BindToClient(output_surface_client_.get()); | 175 output_surface_->BindToClient(output_surface_client_.get()); |
176 shared_bitmap_manager_.reset(new TestSharedBitmapManager()); | 176 shared_bitmap_manager_.reset(new TestSharedBitmapManager()); |
177 resource_provider_ = ResourceProvider::Create( | 177 resource_provider_ = ResourceProvider::Create( |
178 output_surface_.get(), shared_bitmap_manager_.get(), | 178 output_surface_.get(), shared_bitmap_manager_.get(), |
179 gpu_memory_buffer_manager_.get(), main_thread_task_runner_.get(), 0, | 179 gpu_memory_buffer_manager_.get(), main_thread_task_runner_.get(), 0, |
180 false, 1); | 180 false, 1, false); |
181 renderer_ = | 181 renderer_ = |
182 SoftwareRenderer::Create(this, &settings_.renderer_settings, | 182 SoftwareRenderer::Create(this, &settings_.renderer_settings, |
183 output_surface_.get(), resource_provider_.get()); | 183 output_surface_.get(), resource_provider_.get()); |
184 } | 184 } |
185 | 185 |
186 } // namespace cc | 186 } // namespace cc |
OLD | NEW |