| 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 // 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::TracedValue; |
| 28 } |
| 23 class SingleThreadTaskRunner; | 29 class SingleThreadTaskRunner; |
| 24 } | 30 } // namespace base |
| 25 | 31 |
| 26 namespace gfx { | 32 namespace gfx { |
| 27 class Rect; | 33 class Rect; |
| 28 class Vector2d; | 34 class Vector2d; |
| 29 } | 35 } |
| 30 | 36 |
| 31 namespace cc { | 37 namespace cc { |
| 32 class BlockingTaskRunner; | 38 class BlockingTaskRunner; |
| 33 class LayerTreeDebugState; | 39 class LayerTreeDebugState; |
| 34 class OutputSurface; | 40 class OutputSurface; |
| (...skipping 122 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 157 explicit DebugScopedSetMainThreadBlocked(Proxy* proxy) {} | 163 explicit DebugScopedSetMainThreadBlocked(Proxy* proxy) {} |
| 158 ~DebugScopedSetMainThreadBlocked() {} | 164 ~DebugScopedSetMainThreadBlocked() {} |
| 159 private: | 165 private: |
| 160 DISALLOW_COPY_AND_ASSIGN(DebugScopedSetMainThreadBlocked); | 166 DISALLOW_COPY_AND_ASSIGN(DebugScopedSetMainThreadBlocked); |
| 161 }; | 167 }; |
| 162 #endif | 168 #endif |
| 163 | 169 |
| 164 } // namespace cc | 170 } // namespace cc |
| 165 | 171 |
| 166 #endif // CC_TREES_PROXY_H_ | 172 #endif // CC_TREES_PROXY_H_ |
| OLD | NEW |