| 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 CCProxy_h | 5 #ifndef CC_PROXY_H_ |
| 6 #define CCProxy_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> | 12 #include <public/WebCompositorOutputSurface.h> |
| 13 #include "cc/cc_export.h" | 13 #include "cc/cc_export.h" |
| 14 | 14 |
| 15 namespace gfx { | 15 namespace gfx { |
| 16 class Rect; | 16 class Rect; |
| (...skipping 116 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 133 DCHECK(m_proxy->isMainThreadBlocked()); | 133 DCHECK(m_proxy->isMainThreadBlocked()); |
| 134 m_proxy->setMainThreadBlocked(false); | 134 m_proxy->setMainThreadBlocked(false); |
| 135 #endif | 135 #endif |
| 136 } | 136 } |
| 137 private: | 137 private: |
| 138 Proxy* m_proxy; | 138 Proxy* m_proxy; |
| 139 }; | 139 }; |
| 140 | 140 |
| 141 } | 141 } |
| 142 | 142 |
| 143 #endif | 143 #endif // CC_PROXY_H_ |
| OLD | NEW |