| 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/time.h" | 10 #include "base/time.h" |
| 11 #include "base/memory/scoped_ptr.h" | 11 #include "base/memory/scoped_ptr.h" |
| 12 #include <public/WebCompositorOutputSurface.h> | |
| 13 #include "cc/cc_export.h" | 12 #include "cc/cc_export.h" |
| 14 | 13 |
| 15 namespace gfx { | 14 namespace gfx { |
| 16 class Rect; | 15 class Rect; |
| 17 class Vector2d; | 16 class Vector2d; |
| 18 } | 17 } |
| 19 | 18 |
| 20 namespace cc { | 19 namespace cc { |
| 21 | 20 |
| 22 class Thread; | 21 class Thread; |
| (...skipping 113 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 136 class DebugScopedSetMainThreadBlocked { | 135 class DebugScopedSetMainThreadBlocked { |
| 137 public: | 136 public: |
| 138 explicit DebugScopedSetMainThreadBlocked(Proxy*) { } | 137 explicit DebugScopedSetMainThreadBlocked(Proxy*) { } |
| 139 ~DebugScopedSetMainThreadBlocked() { } | 138 ~DebugScopedSetMainThreadBlocked() { } |
| 140 }; | 139 }; |
| 141 #endif | 140 #endif |
| 142 | 141 |
| 143 } | 142 } |
| 144 | 143 |
| 145 #endif // CC_PROXY_H_ | 144 #endif // CC_PROXY_H_ |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 11348371:
cc: Move WebCompositorOutputSurface and related classes into cc/ (Closed)
Base URL: svn://svn.chromium.org/chrome/trunk/src