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/raster/tile_task_worker_pool.h" | 5 #include "cc/raster/tile_task_worker_pool.h" |
6 | 6 |
7 #include "base/test/test_simple_task_runner.h" | 7 #include "base/test/test_simple_task_runner.h" |
8 #include "base/time/time.h" | 8 #include "base/time/time.h" |
9 #include "cc/debug/lap_timer.h" | 9 #include "cc/debug/lap_timer.h" |
10 #include "cc/output/context_provider.h" | 10 #include "cc/output/context_provider.h" |
11 #include "cc/raster/bitmap_tile_task_worker_pool.h" | 11 #include "cc/raster/bitmap_tile_task_worker_pool.h" |
12 #include "cc/raster/gpu_rasterizer.h" | 12 #include "cc/raster/gpu_rasterizer.h" |
13 #include "cc/raster/gpu_tile_task_worker_pool.h" | 13 #include "cc/raster/gpu_tile_task_worker_pool.h" |
14 #include "cc/raster/one_copy_tile_task_worker_pool.h" | 14 #include "cc/raster/one_copy_tile_task_worker_pool.h" |
15 #include "cc/raster/raster_buffer.h" | 15 #include "cc/raster/raster_buffer.h" |
16 #include "cc/raster/synchronous_task_graph_runner.h" | 16 #include "cc/raster/synchronous_task_graph_runner.h" |
| 17 #include "cc/raster/task_category.h" |
17 #include "cc/raster/tile_task_runner.h" | 18 #include "cc/raster/tile_task_runner.h" |
18 #include "cc/raster/zero_copy_tile_task_worker_pool.h" | 19 #include "cc/raster/zero_copy_tile_task_worker_pool.h" |
19 #include "cc/resources/resource_pool.h" | 20 #include "cc/resources/resource_pool.h" |
20 #include "cc/resources/resource_provider.h" | 21 #include "cc/resources/resource_provider.h" |
21 #include "cc/resources/scoped_resource.h" | 22 #include "cc/resources/scoped_resource.h" |
22 #include "cc/test/fake_output_surface.h" | 23 #include "cc/test/fake_output_surface.h" |
23 #include "cc/test/fake_output_surface_client.h" | 24 #include "cc/test/fake_output_surface_client.h" |
24 #include "cc/test/fake_resource_provider.h" | 25 #include "cc/test/fake_resource_provider.h" |
25 #include "cc/test/test_context_support.h" | 26 #include "cc/test/test_context_support.h" |
26 #include "cc/test/test_gpu_memory_buffer_manager.h" | 27 #include "cc/test/test_gpu_memory_buffer_manager.h" |
(...skipping 188 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
215 } | 216 } |
216 | 217 |
217 void BuildTileTaskGraph(TaskGraph* graph, | 218 void BuildTileTaskGraph(TaskGraph* graph, |
218 const RasterTaskVector& raster_tasks) { | 219 const RasterTaskVector& raster_tasks) { |
219 size_t priority = 0; | 220 size_t priority = 0; |
220 | 221 |
221 for (auto& raster_task : raster_tasks) { | 222 for (auto& raster_task : raster_tasks) { |
222 priority++; | 223 priority++; |
223 | 224 |
224 for (auto& decode_task : raster_task->dependencies()) { | 225 for (auto& decode_task : raster_task->dependencies()) { |
225 graph->nodes.push_back( | 226 graph->nodes.push_back(TaskGraph::Node( |
226 TaskGraph::Node(decode_task.get(), priority, 0u)); | 227 decode_task.get(), TASK_CATEGORY_HIGH_PRIORITY, priority, 0u)); |
227 graph->edges.push_back( | 228 graph->edges.push_back( |
228 TaskGraph::Edge(raster_task.get(), decode_task.get())); | 229 TaskGraph::Edge(raster_task.get(), decode_task.get())); |
229 } | 230 } |
230 | 231 |
231 graph->nodes.push_back(TaskGraph::Node( | 232 graph->nodes.push_back( |
232 raster_task.get(), priority, raster_task->dependencies().size())); | 233 TaskGraph::Node(raster_task.get(), TASK_CATEGORY_HIGH_PRIORITY, |
| 234 priority, raster_task->dependencies().size())); |
233 } | 235 } |
234 } | 236 } |
235 | 237 |
236 protected: | 238 protected: |
237 scoped_refptr<ContextProvider> context_provider_; | 239 scoped_refptr<ContextProvider> context_provider_; |
238 FakeOutputSurfaceClient output_surface_client_; | 240 FakeOutputSurfaceClient output_surface_client_; |
239 scoped_ptr<FakeOutputSurface> output_surface_; | 241 scoped_ptr<FakeOutputSurface> output_surface_; |
240 scoped_ptr<ResourceProvider> resource_provider_; | 242 scoped_ptr<ResourceProvider> resource_provider_; |
241 scoped_refptr<base::TestSimpleTaskRunner> task_runner_; | 243 scoped_refptr<base::TestSimpleTaskRunner> task_runner_; |
242 scoped_ptr<SynchronousTaskGraphRunner> task_graph_runner_; | 244 scoped_ptr<SynchronousTaskGraphRunner> task_graph_runner_; |
(...skipping 245 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
488 RunBuildTileTaskGraphTest("1_0", 1, 0); | 490 RunBuildTileTaskGraphTest("1_0", 1, 0); |
489 RunBuildTileTaskGraphTest("32_0", 32, 0); | 491 RunBuildTileTaskGraphTest("32_0", 32, 0); |
490 RunBuildTileTaskGraphTest("1_1", 1, 1); | 492 RunBuildTileTaskGraphTest("1_1", 1, 1); |
491 RunBuildTileTaskGraphTest("32_1", 32, 1); | 493 RunBuildTileTaskGraphTest("32_1", 32, 1); |
492 RunBuildTileTaskGraphTest("1_4", 1, 4); | 494 RunBuildTileTaskGraphTest("1_4", 1, 4); |
493 RunBuildTileTaskGraphTest("32_4", 32, 4); | 495 RunBuildTileTaskGraphTest("32_4", 32, 4); |
494 } | 496 } |
495 | 497 |
496 } // namespace | 498 } // namespace |
497 } // namespace cc | 499 } // namespace cc |
OLD | NEW |