| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 UI_COMPOSITOR_COMPOSITOR_H_ | 5 #ifndef UI_COMPOSITOR_COMPOSITOR_H_ |
| 6 #define UI_COMPOSITOR_COMPOSITOR_H_ | 6 #define UI_COMPOSITOR_COMPOSITOR_H_ |
| 7 | 7 |
| 8 #include <string> | 8 #include <string> |
| 9 | 9 |
| 10 #include "base/containers/hash_tables.h" | 10 #include "base/containers/hash_tables.h" |
| (...skipping 196 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 207 // Signals swap has aborted (e.g. lost context). | 207 // Signals swap has aborted (e.g. lost context). |
| 208 void OnSwapBuffersAborted(); | 208 void OnSwapBuffersAborted(); |
| 209 | 209 |
| 210 // LayerTreeHostClient implementation. | 210 // LayerTreeHostClient implementation. |
| 211 virtual void WillBeginMainFrame(int frame_id) OVERRIDE {} | 211 virtual void WillBeginMainFrame(int frame_id) OVERRIDE {} |
| 212 virtual void DidBeginMainFrame() OVERRIDE {} | 212 virtual void DidBeginMainFrame() OVERRIDE {} |
| 213 virtual void Animate(base::TimeTicks frame_begin_time) OVERRIDE; | 213 virtual void Animate(base::TimeTicks frame_begin_time) OVERRIDE; |
| 214 virtual void Layout() OVERRIDE; | 214 virtual void Layout() OVERRIDE; |
| 215 virtual void ApplyScrollAndScale(const gfx::Vector2d& scroll_delta, | 215 virtual void ApplyScrollAndScale(const gfx::Vector2d& scroll_delta, |
| 216 float page_scale) OVERRIDE {} | 216 float page_scale) OVERRIDE {} |
| 217 virtual scoped_ptr<cc::OutputSurface> CreateOutputSurface(bool fallback) | 217 virtual void RequestNewOutputSurface(bool fallback) OVERRIDE; |
| 218 OVERRIDE; | |
| 219 virtual void DidInitializeOutputSurface() OVERRIDE {} | 218 virtual void DidInitializeOutputSurface() OVERRIDE {} |
| 220 virtual void WillCommit() OVERRIDE {} | 219 virtual void WillCommit() OVERRIDE {} |
| 221 virtual void DidCommit() OVERRIDE; | 220 virtual void DidCommit() OVERRIDE; |
| 222 virtual void DidCommitAndDrawFrame() OVERRIDE; | 221 virtual void DidCommitAndDrawFrame() OVERRIDE; |
| 223 virtual void DidCompleteSwapBuffers() OVERRIDE; | 222 virtual void DidCompleteSwapBuffers() OVERRIDE; |
| 224 | 223 |
| 225 // cc::LayerTreeHostSingleThreadClient implementation. | 224 // cc::LayerTreeHostSingleThreadClient implementation. |
| 226 virtual void DidPostSwapBuffers() OVERRIDE; | 225 virtual void DidPostSwapBuffers() OVERRIDE; |
| 227 virtual void DidAbortSwapBuffers() OVERRIDE; | 226 virtual void DidAbortSwapBuffers() OVERRIDE; |
| 228 | 227 |
| (...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 277 CompositorLock* compositor_lock_; | 276 CompositorLock* compositor_lock_; |
| 278 | 277 |
| 279 LayerAnimatorCollection layer_animator_collection_; | 278 LayerAnimatorCollection layer_animator_collection_; |
| 280 | 279 |
| 281 DISALLOW_COPY_AND_ASSIGN(Compositor); | 280 DISALLOW_COPY_AND_ASSIGN(Compositor); |
| 282 }; | 281 }; |
| 283 | 282 |
| 284 } // namespace ui | 283 } // namespace ui |
| 285 | 284 |
| 286 #endif // UI_COMPOSITOR_COMPOSITOR_H_ | 285 #endif // UI_COMPOSITOR_COMPOSITOR_H_ |
| OLD | NEW |