OLD | NEW |
1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 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 "base/test/sequenced_task_runner_test_template.h" | 5 #include "base/test/sequenced_task_runner_test_template.h" |
6 #include "base/test/task_runner_test_template.h" | 6 #include "base/test/task_runner_test_template.h" |
7 #include "base/threading/simple_thread.h" | 7 #include "base/threading/simple_thread.h" |
8 #include "cc/test/task_graph_runner_test_template.h" | 8 #include "cc/test/task_graph_runner_test_template.h" |
9 #include "content/renderer/raster_worker_pool.h" | 9 #include "content/renderer/raster_worker_pool.h" |
10 | 10 |
11 namespace base { | 11 namespace base { |
12 namespace { | 12 namespace { |
13 | 13 |
14 // Number of threads spawned in tests. | 14 // Number of threads spawned in tests. |
15 const int kNumThreads = 4; | 15 const int kNumThreads = 4; |
16 | 16 |
17 class RasterWorkerPoolTestDelegate { | 17 class RasterWorkerPoolTestDelegate { |
18 public: | 18 public: |
19 RasterWorkerPoolTestDelegate() | 19 RasterWorkerPoolTestDelegate() |
20 : raster_worker_pool_(new content::RasterWorkerPool()) {} | 20 : raster_worker_pool_(new content::RasterWorkerPool()) {} |
21 | 21 |
22 void StartTaskRunner() { | 22 void StartTaskRunner() { |
23 raster_worker_pool_->Start(kNumThreads, SimpleThread::Options()); | 23 raster_worker_pool_->Start( |
| 24 kNumThreads, false /* use_single_thread_for_background_raster_tasks */, |
| 25 SimpleThread::Options()); |
24 } | 26 } |
25 | 27 |
26 scoped_refptr<content::RasterWorkerPool> GetTaskRunner() { | 28 scoped_refptr<content::RasterWorkerPool> GetTaskRunner() { |
27 return raster_worker_pool_; | 29 return raster_worker_pool_; |
28 } | 30 } |
29 | 31 |
30 void StopTaskRunner() { raster_worker_pool_->FlushForTesting(); } | 32 void StopTaskRunner() { raster_worker_pool_->FlushForTesting(); } |
31 | 33 |
32 ~RasterWorkerPoolTestDelegate() { raster_worker_pool_->Shutdown(); } | 34 ~RasterWorkerPoolTestDelegate() { raster_worker_pool_->Shutdown(); } |
33 | 35 |
34 private: | 36 private: |
35 scoped_refptr<content::RasterWorkerPool> raster_worker_pool_; | 37 scoped_refptr<content::RasterWorkerPool> raster_worker_pool_; |
36 }; | 38 }; |
37 | 39 |
38 INSTANTIATE_TYPED_TEST_CASE_P(RasterWorkerPool, | 40 INSTANTIATE_TYPED_TEST_CASE_P(RasterWorkerPool, |
39 TaskRunnerTest, | 41 TaskRunnerTest, |
40 RasterWorkerPoolTestDelegate); | 42 RasterWorkerPoolTestDelegate); |
41 | 43 |
42 class RasterWorkerPoolSequencedTestDelegate { | 44 class RasterWorkerPoolSequencedTestDelegate { |
43 public: | 45 public: |
44 RasterWorkerPoolSequencedTestDelegate() | 46 RasterWorkerPoolSequencedTestDelegate() |
45 : raster_worker_pool_(new content::RasterWorkerPool()) {} | 47 : raster_worker_pool_(new content::RasterWorkerPool()) {} |
46 | 48 |
47 void StartTaskRunner() { | 49 void StartTaskRunner() { |
48 raster_worker_pool_->Start(kNumThreads, SimpleThread::Options()); | 50 raster_worker_pool_->Start( |
| 51 kNumThreads, false /* use_single_thread_for_background_raster_tasks */, |
| 52 SimpleThread::Options()); |
49 } | 53 } |
50 | 54 |
51 scoped_refptr<base::SequencedTaskRunner> GetTaskRunner() { | 55 scoped_refptr<base::SequencedTaskRunner> GetTaskRunner() { |
52 return raster_worker_pool_->CreateSequencedTaskRunner(); | 56 return raster_worker_pool_->CreateSequencedTaskRunner(); |
53 } | 57 } |
54 | 58 |
55 void StopTaskRunner() { raster_worker_pool_->FlushForTesting(); } | 59 void StopTaskRunner() { raster_worker_pool_->FlushForTesting(); } |
56 | 60 |
57 ~RasterWorkerPoolSequencedTestDelegate() { raster_worker_pool_->Shutdown(); } | 61 ~RasterWorkerPoolSequencedTestDelegate() { raster_worker_pool_->Shutdown(); } |
58 | 62 |
(...skipping 11 matching lines...) Expand all Loading... |
70 namespace cc { | 74 namespace cc { |
71 namespace { | 75 namespace { |
72 | 76 |
73 template <int NumThreads> | 77 template <int NumThreads> |
74 class RasterWorkerPoolTaskGraphRunnerTestDelegate { | 78 class RasterWorkerPoolTaskGraphRunnerTestDelegate { |
75 public: | 79 public: |
76 RasterWorkerPoolTaskGraphRunnerTestDelegate() | 80 RasterWorkerPoolTaskGraphRunnerTestDelegate() |
77 : raster_worker_pool_(new content::RasterWorkerPool()) {} | 81 : raster_worker_pool_(new content::RasterWorkerPool()) {} |
78 | 82 |
79 void StartTaskGraphRunner() { | 83 void StartTaskGraphRunner() { |
80 raster_worker_pool_->Start(NumThreads, base::SimpleThread::Options()); | 84 raster_worker_pool_->Start( |
| 85 NumThreads, false /* use_single_thread_for_background_raster_tasks */, |
| 86 base::SimpleThread::Options()); |
81 } | 87 } |
82 | 88 |
83 cc::TaskGraphRunner* GetTaskGraphRunner() { | 89 cc::TaskGraphRunner* GetTaskGraphRunner() { |
84 return raster_worker_pool_->GetTaskGraphRunner(); | 90 return raster_worker_pool_->GetTaskGraphRunner(); |
85 } | 91 } |
86 | 92 |
87 void StopTaskGraphRunner() { raster_worker_pool_->FlushForTesting(); } | 93 void StopTaskGraphRunner() { raster_worker_pool_->FlushForTesting(); } |
88 | 94 |
89 ~RasterWorkerPoolTaskGraphRunnerTestDelegate() { | 95 ~RasterWorkerPoolTaskGraphRunnerTestDelegate() { |
90 raster_worker_pool_->Shutdown(); | 96 raster_worker_pool_->Shutdown(); |
(...skipping 20 matching lines...) Expand all Loading... |
111 TaskGraphRunnerTest, | 117 TaskGraphRunnerTest, |
112 RasterWorkerPoolTaskGraphRunnerTestDelegate<5>); | 118 RasterWorkerPoolTaskGraphRunnerTestDelegate<5>); |
113 | 119 |
114 // Single threaded tests. | 120 // Single threaded tests. |
115 INSTANTIATE_TYPED_TEST_CASE_P(RasterWorkerPool, | 121 INSTANTIATE_TYPED_TEST_CASE_P(RasterWorkerPool, |
116 SingleThreadTaskGraphRunnerTest, | 122 SingleThreadTaskGraphRunnerTest, |
117 RasterWorkerPoolTaskGraphRunnerTestDelegate<1>); | 123 RasterWorkerPoolTaskGraphRunnerTestDelegate<1>); |
118 | 124 |
119 } // namespace | 125 } // namespace |
120 } // namespace cc | 126 } // namespace cc |
OLD | NEW |