| 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 211 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 222 void OnSwapBuffersComplete(); | 222 void OnSwapBuffersComplete(); |
| 223 | 223 |
| 224 // Signals swap has aborted (e.g. lost context). | 224 // Signals swap has aborted (e.g. lost context). |
| 225 void OnSwapBuffersAborted(); | 225 void OnSwapBuffersAborted(); |
| 226 | 226 |
| 227 // LayerTreeHostClient implementation. | 227 // LayerTreeHostClient implementation. |
| 228 virtual void WillBeginMainFrame(int frame_id) OVERRIDE {} | 228 virtual void WillBeginMainFrame(int frame_id) OVERRIDE {} |
| 229 virtual void DidBeginMainFrame() OVERRIDE {} | 229 virtual void DidBeginMainFrame() OVERRIDE {} |
| 230 virtual void BeginMainFrame(const cc::BeginFrameArgs& args) OVERRIDE; | 230 virtual void BeginMainFrame(const cc::BeginFrameArgs& args) OVERRIDE; |
| 231 virtual void Layout() OVERRIDE; | 231 virtual void Layout() OVERRIDE; |
| 232 virtual void ApplyScrollAndScale(const gfx::Vector2d& scroll_delta, | 232 virtual void ApplyViewportProperties( |
| 233 float page_scale) OVERRIDE {} | 233 const gfx::Vector2d& scroll_delta, |
| 234 float page_scale, |
| 235 float top_controls_delta) OVERRIDE {} |
| 234 virtual scoped_ptr<cc::OutputSurface> CreateOutputSurface(bool fallback) | 236 virtual scoped_ptr<cc::OutputSurface> CreateOutputSurface(bool fallback) |
| 235 OVERRIDE; | 237 OVERRIDE; |
| 236 virtual void DidInitializeOutputSurface() OVERRIDE {} | 238 virtual void DidInitializeOutputSurface() OVERRIDE {} |
| 237 virtual void WillCommit() OVERRIDE {} | 239 virtual void WillCommit() OVERRIDE {} |
| 238 virtual void DidCommit() OVERRIDE; | 240 virtual void DidCommit() OVERRIDE; |
| 239 virtual void DidCommitAndDrawFrame() OVERRIDE; | 241 virtual void DidCommitAndDrawFrame() OVERRIDE; |
| 240 virtual void DidCompleteSwapBuffers() OVERRIDE; | 242 virtual void DidCompleteSwapBuffers() OVERRIDE; |
| 241 | 243 |
| 242 // cc::LayerTreeHostSingleThreadClient implementation. | 244 // cc::LayerTreeHostSingleThreadClient implementation. |
| 243 virtual void ScheduleComposite() OVERRIDE; | 245 virtual void ScheduleComposite() OVERRIDE; |
| (...skipping 68 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 312 LayerAnimatorCollection layer_animator_collection_; | 314 LayerAnimatorCollection layer_animator_collection_; |
| 313 | 315 |
| 314 base::WeakPtrFactory<Compositor> schedule_draw_factory_; | 316 base::WeakPtrFactory<Compositor> schedule_draw_factory_; |
| 315 | 317 |
| 316 DISALLOW_COPY_AND_ASSIGN(Compositor); | 318 DISALLOW_COPY_AND_ASSIGN(Compositor); |
| 317 }; | 319 }; |
| 318 | 320 |
| 319 } // namespace ui | 321 } // namespace ui |
| 320 | 322 |
| 321 #endif // UI_COMPOSITOR_COMPOSITOR_H_ | 323 #endif // UI_COMPOSITOR_COMPOSITOR_H_ |
| OLD | NEW |