OLD | NEW |
1 // Copyright 2011 The Chromium Authors. All rights reserved. | 1 // Copyright 2011 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 CC_TREES_PROXY_H_ | 5 #ifndef CC_TREES_PROXY_H_ |
6 #define CC_TREES_PROXY_H_ | 6 #define CC_TREES_PROXY_H_ |
7 | 7 |
8 #include <string> | 8 #include <string> |
9 | 9 |
10 #include "base/basictypes.h" | 10 #include "base/basictypes.h" |
11 #include "base/logging.h" | 11 #include "base/logging.h" |
12 #include "base/memory/ref_counted.h" | 12 #include "base/memory/ref_counted.h" |
13 #include "base/memory/scoped_ptr.h" | 13 #include "base/memory/scoped_ptr.h" |
14 #include "base/threading/platform_thread.h" | 14 #include "base/threading/platform_thread.h" |
15 #include "base/time/time.h" | 15 #include "base/time/time.h" |
16 #include "base/values.h" | 16 #include "base/values.h" |
17 #include "cc/base/cc_export.h" | 17 #include "cc/base/cc_export.h" |
18 | 18 |
19 namespace base { | 19 namespace base { |
20 namespace debug { | 20 namespace trace_event { |
21 class TracedValue; | 21 class TracedValue; |
22 } | 22 } |
| 23 |
| 24 // This is added temporarily. Once the renaming of namespace usages |
| 25 // accross all folders are done, this will be removed. |
| 26 // TODO(ssid): crrev.com/837303004 |
| 27 namespace debug { |
| 28 using ::base::trace_event::TracedValue; |
| 29 } |
23 class SingleThreadTaskRunner; | 30 class SingleThreadTaskRunner; |
24 } | 31 } // namespace base |
25 | 32 |
26 namespace gfx { | 33 namespace gfx { |
27 class Rect; | 34 class Rect; |
28 class Vector2d; | 35 class Vector2d; |
29 } | 36 } |
30 | 37 |
31 namespace cc { | 38 namespace cc { |
32 class BlockingTaskRunner; | 39 class BlockingTaskRunner; |
33 class LayerTreeDebugState; | 40 class LayerTreeDebugState; |
34 class OutputSurface; | 41 class OutputSurface; |
(...skipping 122 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
157 explicit DebugScopedSetMainThreadBlocked(Proxy* proxy) {} | 164 explicit DebugScopedSetMainThreadBlocked(Proxy* proxy) {} |
158 ~DebugScopedSetMainThreadBlocked() {} | 165 ~DebugScopedSetMainThreadBlocked() {} |
159 private: | 166 private: |
160 DISALLOW_COPY_AND_ASSIGN(DebugScopedSetMainThreadBlocked); | 167 DISALLOW_COPY_AND_ASSIGN(DebugScopedSetMainThreadBlocked); |
161 }; | 168 }; |
162 #endif | 169 #endif |
163 | 170 |
164 } // namespace cc | 171 } // namespace cc |
165 | 172 |
166 #endif // CC_TREES_PROXY_H_ | 173 #endif // CC_TREES_PROXY_H_ |
OLD | NEW |