| 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_PROXY_H_ | 5 #ifndef CC_PROXY_H_ |
| 6 #define CC_PROXY_H_ | 6 #define CC_PROXY_H_ |
| 7 | 7 |
| 8 #include "base/basictypes.h" | 8 #include "base/basictypes.h" |
| 9 #include "base/logging.h" | 9 #include "base/logging.h" |
| 10 #include "base/memory/scoped_ptr.h" | 10 #include "base/memory/scoped_ptr.h" |
| 11 #include "base/time.h" | 11 #include "base/time.h" |
| 12 #include "base/values.h" | 12 #include "base/values.h" |
| 13 #include "cc/cc_export.h" | 13 #include "cc/base/cc_export.h" |
| 14 #include "skia/ext/refptr.h" | 14 #include "skia/ext/refptr.h" |
| 15 #include "third_party/skia/include/core/SkPicture.h" | 15 #include "third_party/skia/include/core/SkPicture.h" |
| 16 | 16 |
| 17 namespace gfx { | 17 namespace gfx { |
| 18 class Rect; | 18 class Rect; |
| 19 class Vector2d; | 19 class Vector2d; |
| 20 } | 20 } |
| 21 | 21 |
| 22 namespace cc { | 22 namespace cc { |
| 23 | 23 |
| (...skipping 124 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 148 class DebugScopedSetMainThreadBlocked { | 148 class DebugScopedSetMainThreadBlocked { |
| 149 public: | 149 public: |
| 150 explicit DebugScopedSetMainThreadBlocked(Proxy* proxy) {} | 150 explicit DebugScopedSetMainThreadBlocked(Proxy* proxy) {} |
| 151 ~DebugScopedSetMainThreadBlocked() {} | 151 ~DebugScopedSetMainThreadBlocked() {} |
| 152 }; | 152 }; |
| 153 #endif | 153 #endif |
| 154 | 154 |
| 155 } | 155 } |
| 156 | 156 |
| 157 #endif // CC_PROXY_H_ | 157 #endif // CC_PROXY_H_ |
| OLD | NEW |