OLD | NEW |
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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 #ifndef CONTENT_RENDERER_SCHEDULER_TASK_QUEUE_MANAGER_H_ | 5 #ifndef CONTENT_RENDERER_SCHEDULER_TASK_QUEUE_MANAGER_H_ |
6 #define CONTENT_RENDERER_SCHEDULER_TASK_QUEUE_MANAGER_H_ | 6 #define CONTENT_RENDERER_SCHEDULER_TASK_QUEUE_MANAGER_H_ |
7 | 7 |
8 #include "base/atomic_sequence_num.h" | 8 #include "base/atomic_sequence_num.h" |
9 #include "base/debug/task_annotator.h" | 9 #include "base/debug/task_annotator.h" |
10 #include "base/macros.h" | 10 #include "base/macros.h" |
11 #include "base/memory/weak_ptr.h" | 11 #include "base/memory/weak_ptr.h" |
12 #include "base/pending_task.h" | 12 #include "base/pending_task.h" |
13 #include "base/single_thread_task_runner.h" | 13 #include "base/single_thread_task_runner.h" |
14 #include "base/synchronization/lock.h" | 14 #include "base/synchronization/lock.h" |
15 #include "base/threading/thread_checker.h" | 15 #include "base/threading/thread_checker.h" |
16 #include "content/common/content_export.h" | 16 #include "content/common/content_export.h" |
17 | 17 |
18 namespace base { | 18 namespace base { |
19 namespace debug { | 19 namespace trace_event { |
20 class ConvertableToTraceFormat; | 20 class ConvertableToTraceFormat; |
21 class TracedValue; | 21 class TracedValue; |
22 } | 22 } |
| 23 |
| 24 // TODO(ssid): remove these aliases after the tracing clients are moved to the |
| 25 // new trace_event namespace. See crbug.com/451032. ETA: March 2015 |
| 26 namespace debug { |
| 27 using ::base::trace_event::ConvertableToTraceFormat; |
| 28 using ::base::trace_event::TracedValue; |
23 } | 29 } |
| 30 } // namespace base |
24 | 31 |
25 namespace cc { | 32 namespace cc { |
26 class TestNowSource; | 33 class TestNowSource; |
27 } | 34 } |
28 | 35 |
29 namespace content { | 36 namespace content { |
30 namespace internal { | 37 namespace internal { |
31 class TaskQueue; | 38 class TaskQueue; |
32 } | 39 } |
33 class TaskQueueSelector; | 40 class TaskQueueSelector; |
(...skipping 122 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
156 scoped_refptr<cc::TestNowSource> time_source_; | 163 scoped_refptr<cc::TestNowSource> time_source_; |
157 | 164 |
158 base::WeakPtrFactory<TaskQueueManager> weak_factory_; | 165 base::WeakPtrFactory<TaskQueueManager> weak_factory_; |
159 | 166 |
160 DISALLOW_COPY_AND_ASSIGN(TaskQueueManager); | 167 DISALLOW_COPY_AND_ASSIGN(TaskQueueManager); |
161 }; | 168 }; |
162 | 169 |
163 } // namespace content | 170 } // namespace content |
164 | 171 |
165 #endif // CONTENT_RENDERER_SCHEDULER_TASK_QUEUE_MANAGER_H_ | 172 #endif // CONTENT_RENDERER_SCHEDULER_TASK_QUEUE_MANAGER_H_ |
OLD | NEW |