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/resources/raster_worker_pool.h" | 5 #include "cc/resources/raster_worker_pool.h" |
6 | 6 |
7 #include "base/time/time.h" | 7 #include "base/time/time.h" |
8 #include "cc/output/context_provider.h" | 8 #include "cc/output/context_provider.h" |
9 #include "cc/resources/direct_raster_worker_pool.h" | 9 #include "cc/resources/direct_raster_worker_pool.h" |
10 #include "cc/resources/image_raster_worker_pool.h" | 10 #include "cc/resources/image_raster_worker_pool.h" |
11 #include "cc/resources/pixel_buffer_raster_worker_pool.h" | 11 #include "cc/resources/pixel_buffer_raster_worker_pool.h" |
12 #include "cc/resources/resource_provider.h" | 12 #include "cc/resources/resource_provider.h" |
13 #include "cc/resources/scoped_resource.h" | 13 #include "cc/resources/scoped_resource.h" |
14 #include "cc/test/fake_output_surface.h" | 14 #include "cc/test/fake_output_surface.h" |
15 #include "cc/test/fake_output_surface_client.h" | 15 #include "cc/test/fake_output_surface_client.h" |
16 #include "cc/test/lap_timer.h" | 16 #include "cc/test/lap_timer.h" |
17 #include "cc/test/test_context_support.h" | 17 #include "cc/test/test_context_support.h" |
| 18 #include "cc/test/test_shared_bitmap_manager.h" |
18 #include "cc/test/test_web_graphics_context_3d.h" | 19 #include "cc/test/test_web_graphics_context_3d.h" |
19 #include "testing/gtest/include/gtest/gtest.h" | 20 #include "testing/gtest/include/gtest/gtest.h" |
20 #include "testing/perf/perf_test.h" | 21 #include "testing/perf/perf_test.h" |
21 #include "third_party/khronos/GLES2/gl2.h" | 22 #include "third_party/khronos/GLES2/gl2.h" |
22 | 23 |
23 namespace cc { | 24 namespace cc { |
24 namespace { | 25 namespace { |
25 | 26 |
26 class PerfContextProvider : public ContextProvider { | 27 class PerfContextProvider : public ContextProvider { |
27 public: | 28 public: |
(...skipping 134 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
162 RasterTaskVector; | 163 RasterTaskVector; |
163 | 164 |
164 RasterWorkerPoolPerfTestBase() | 165 RasterWorkerPoolPerfTestBase() |
165 : context_provider_(make_scoped_refptr(new PerfContextProvider)), | 166 : context_provider_(make_scoped_refptr(new PerfContextProvider)), |
166 timer_(kWarmupRuns, | 167 timer_(kWarmupRuns, |
167 base::TimeDelta::FromMilliseconds(kTimeLimitMillis), | 168 base::TimeDelta::FromMilliseconds(kTimeLimitMillis), |
168 kTimeCheckInterval) { | 169 kTimeCheckInterval) { |
169 output_surface_ = FakeOutputSurface::Create3d(context_provider_).Pass(); | 170 output_surface_ = FakeOutputSurface::Create3d(context_provider_).Pass(); |
170 CHECK(output_surface_->BindToClient(&output_surface_client_)); | 171 CHECK(output_surface_->BindToClient(&output_surface_client_)); |
171 | 172 |
172 resource_provider_ = ResourceProvider::Create( | 173 shared_bitmap_manager_.reset(new TestSharedBitmapManager()); |
173 output_surface_.get(), NULL, 0, false, 1).Pass(); | 174 resource_provider_ = |
| 175 ResourceProvider::Create( |
| 176 output_surface_.get(), shared_bitmap_manager_.get(), 0, false, 1) |
| 177 .Pass(); |
174 } | 178 } |
175 virtual ~RasterWorkerPoolPerfTestBase() { resource_provider_.reset(); } | 179 virtual ~RasterWorkerPoolPerfTestBase() { resource_provider_.reset(); } |
176 | 180 |
177 void CreateImageDecodeTasks( | 181 void CreateImageDecodeTasks( |
178 unsigned num_image_decode_tasks, | 182 unsigned num_image_decode_tasks, |
179 internal::WorkerPoolTask::Vector* image_decode_tasks) { | 183 internal::WorkerPoolTask::Vector* image_decode_tasks) { |
180 for (unsigned i = 0; i < num_image_decode_tasks; ++i) | 184 for (unsigned i = 0; i < num_image_decode_tasks; ++i) |
181 image_decode_tasks->push_back(new PerfWorkerPoolTaskImpl); | 185 image_decode_tasks->push_back(new PerfWorkerPoolTaskImpl); |
182 } | 186 } |
183 | 187 |
(...skipping 21 matching lines...) Expand all Loading... |
205 queue->items.push_back(RasterTaskQueue::Item(raster_tasks[i].get(), | 209 queue->items.push_back(RasterTaskQueue::Item(raster_tasks[i].get(), |
206 required_for_activation)); | 210 required_for_activation)); |
207 queue->required_for_activation_count += required_for_activation; | 211 queue->required_for_activation_count += required_for_activation; |
208 } | 212 } |
209 } | 213 } |
210 | 214 |
211 protected: | 215 protected: |
212 scoped_refptr<ContextProvider> context_provider_; | 216 scoped_refptr<ContextProvider> context_provider_; |
213 FakeOutputSurfaceClient output_surface_client_; | 217 FakeOutputSurfaceClient output_surface_client_; |
214 scoped_ptr<FakeOutputSurface> output_surface_; | 218 scoped_ptr<FakeOutputSurface> output_surface_; |
| 219 scoped_ptr<SharedBitmapManager> shared_bitmap_manager_; |
215 scoped_ptr<ResourceProvider> resource_provider_; | 220 scoped_ptr<ResourceProvider> resource_provider_; |
216 LapTimer timer_; | 221 LapTimer timer_; |
217 }; | 222 }; |
218 | 223 |
219 class RasterWorkerPoolPerfTest | 224 class RasterWorkerPoolPerfTest |
220 : public RasterWorkerPoolPerfTestBase, | 225 : public RasterWorkerPoolPerfTestBase, |
221 public testing::TestWithParam<RasterWorkerPoolType>, | 226 public testing::TestWithParam<RasterWorkerPoolType>, |
222 public RasterWorkerPoolClient { | 227 public RasterWorkerPoolClient { |
223 public: | 228 public: |
224 RasterWorkerPoolPerfTest() : task_graph_runner_(new PerfTaskGraphRunnerImpl) { | 229 RasterWorkerPoolPerfTest() : task_graph_runner_(new PerfTaskGraphRunnerImpl) { |
(...skipping 226 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
451 RunBuildRasterTaskQueueTest("1_0", 1, 0); | 456 RunBuildRasterTaskQueueTest("1_0", 1, 0); |
452 RunBuildRasterTaskQueueTest("32_0", 32, 0); | 457 RunBuildRasterTaskQueueTest("32_0", 32, 0); |
453 RunBuildRasterTaskQueueTest("1_1", 1, 1); | 458 RunBuildRasterTaskQueueTest("1_1", 1, 1); |
454 RunBuildRasterTaskQueueTest("32_1", 32, 1); | 459 RunBuildRasterTaskQueueTest("32_1", 32, 1); |
455 RunBuildRasterTaskQueueTest("1_4", 1, 4); | 460 RunBuildRasterTaskQueueTest("1_4", 1, 4); |
456 RunBuildRasterTaskQueueTest("32_4", 32, 4); | 461 RunBuildRasterTaskQueueTest("32_4", 32, 4); |
457 } | 462 } |
458 | 463 |
459 } // namespace | 464 } // namespace |
460 } // namespace cc | 465 } // namespace cc |
OLD | NEW |