| 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 246 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 257 void ApplyViewportDeltas(const gfx::Vector2d& scroll_delta, | 257 void ApplyViewportDeltas(const gfx::Vector2d& scroll_delta, |
| 258 float page_scale, | 258 float page_scale, |
| 259 float top_controls_delta) override {} | 259 float top_controls_delta) override {} |
| 260 void RequestNewOutputSurface() override; | 260 void RequestNewOutputSurface() override; |
| 261 void DidInitializeOutputSurface() override; | 261 void DidInitializeOutputSurface() override; |
| 262 void DidFailToInitializeOutputSurface() override; | 262 void DidFailToInitializeOutputSurface() override; |
| 263 void WillCommit() override {} | 263 void WillCommit() override {} |
| 264 void DidCommit() override; | 264 void DidCommit() override; |
| 265 void DidCommitAndDrawFrame() override; | 265 void DidCommitAndDrawFrame() override; |
| 266 void DidCompleteSwapBuffers() override; | 266 void DidCompleteSwapBuffers() override; |
| 267 void DidCompletePageScaleAnimation() override {} |
| 267 | 268 |
| 268 // cc::LayerTreeHostSingleThreadClient implementation. | 269 // cc::LayerTreeHostSingleThreadClient implementation. |
| 269 void ScheduleComposite() override; | 270 void ScheduleComposite() override; |
| 270 void ScheduleAnimation() override; | 271 void ScheduleAnimation() override; |
| 271 void DidPostSwapBuffers() override; | 272 void DidPostSwapBuffers() override; |
| 272 void DidAbortSwapBuffers() override; | 273 void DidAbortSwapBuffers() override; |
| 273 | 274 |
| 274 int last_started_frame() { return last_started_frame_; } | 275 int last_started_frame() { return last_started_frame_; } |
| 275 int last_ended_frame() { return last_ended_frame_; } | 276 int last_ended_frame() { return last_ended_frame_; } |
| 276 | 277 |
| (...skipping 74 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 351 LayerAnimatorCollection layer_animator_collection_; | 352 LayerAnimatorCollection layer_animator_collection_; |
| 352 | 353 |
| 353 base::WeakPtrFactory<Compositor> weak_ptr_factory_; | 354 base::WeakPtrFactory<Compositor> weak_ptr_factory_; |
| 354 | 355 |
| 355 DISALLOW_COPY_AND_ASSIGN(Compositor); | 356 DISALLOW_COPY_AND_ASSIGN(Compositor); |
| 356 }; | 357 }; |
| 357 | 358 |
| 358 } // namespace ui | 359 } // namespace ui |
| 359 | 360 |
| 360 #endif // UI_COMPOSITOR_COMPOSITOR_H_ | 361 #endif // UI_COMPOSITOR_COMPOSITOR_H_ |
| OLD | NEW |