| 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 238 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 249 float top_controls_delta) override {} | 249 float top_controls_delta) override {} |
| 250 void ApplyViewportDeltas(const gfx::Vector2d& scroll_delta, | 250 void ApplyViewportDeltas(const gfx::Vector2d& scroll_delta, |
| 251 float page_scale, | 251 float page_scale, |
| 252 float top_controls_delta) override {} | 252 float top_controls_delta) override {} |
| 253 void RequestNewOutputSurface(bool fallback) override; | 253 void RequestNewOutputSurface(bool fallback) override; |
| 254 void DidInitializeOutputSurface() override {} | 254 void DidInitializeOutputSurface() override {} |
| 255 void WillCommit() override {} | 255 void WillCommit() override {} |
| 256 void DidCommit() override; | 256 void DidCommit() override; |
| 257 void DidCommitAndDrawFrame() override; | 257 void DidCommitAndDrawFrame() override; |
| 258 void DidCompleteSwapBuffers() override; | 258 void DidCompleteSwapBuffers() override; |
| 259 void DidCompletePageScaleAnimation() override; |
| 259 | 260 |
| 260 // cc::LayerTreeHostSingleThreadClient implementation. | 261 // cc::LayerTreeHostSingleThreadClient implementation. |
| 261 void ScheduleComposite() override; | 262 void ScheduleComposite() override; |
| 262 void ScheduleAnimation() override; | 263 void ScheduleAnimation() override; |
| 263 void DidPostSwapBuffers() override; | 264 void DidPostSwapBuffers() override; |
| 264 void DidAbortSwapBuffers() override; | 265 void DidAbortSwapBuffers() override; |
| 265 | 266 |
| 266 int last_started_frame() { return last_started_frame_; } | 267 int last_started_frame() { return last_started_frame_; } |
| 267 int last_ended_frame() { return last_ended_frame_; } | 268 int last_ended_frame() { return last_ended_frame_; } |
| 268 | 269 |
| (...skipping 66 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 335 LayerAnimatorCollection layer_animator_collection_; | 336 LayerAnimatorCollection layer_animator_collection_; |
| 336 | 337 |
| 337 base::WeakPtrFactory<Compositor> weak_ptr_factory_; | 338 base::WeakPtrFactory<Compositor> weak_ptr_factory_; |
| 338 | 339 |
| 339 DISALLOW_COPY_AND_ASSIGN(Compositor); | 340 DISALLOW_COPY_AND_ASSIGN(Compositor); |
| 340 }; | 341 }; |
| 341 | 342 |
| 342 } // namespace ui | 343 } // namespace ui |
| 343 | 344 |
| 344 #endif // UI_COMPOSITOR_COMPOSITOR_H_ | 345 #endif // UI_COMPOSITOR_COMPOSITOR_H_ |
| OLD | NEW |