| 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 #include "ui/compositor/compositor.h" | 5 #include "ui/compositor/compositor.h" |
| 6 | 6 |
| 7 #include <stddef.h> | 7 #include <stddef.h> |
| 8 | 8 |
| 9 #include <algorithm> | 9 #include <algorithm> |
| 10 #include <deque> | 10 #include <deque> |
| (...skipping 473 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 484 void Compositor::DidCommit() { | 484 void Compositor::DidCommit() { |
| 485 DCHECK(!IsLocked()); | 485 DCHECK(!IsLocked()); |
| 486 FOR_EACH_OBSERVER(CompositorObserver, | 486 FOR_EACH_OBSERVER(CompositorObserver, |
| 487 observer_list_, | 487 observer_list_, |
| 488 OnCompositingDidCommit(this)); | 488 OnCompositingDidCommit(this)); |
| 489 } | 489 } |
| 490 | 490 |
| 491 void Compositor::DidCommitAndDrawFrame() { | 491 void Compositor::DidCommitAndDrawFrame() { |
| 492 } | 492 } |
| 493 | 493 |
| 494 void Compositor::DidCompleteSwapBuffers() { | 494 void Compositor::DidReceiveCompositorFrameAck() { |
| 495 FOR_EACH_OBSERVER(CompositorObserver, observer_list_, | 495 FOR_EACH_OBSERVER(CompositorObserver, observer_list_, |
| 496 OnCompositingEnded(this)); | 496 OnCompositingEnded(this)); |
| 497 } | 497 } |
| 498 | 498 |
| 499 void Compositor::DidPostSwapBuffers() { | 499 void Compositor::DidPostSwapBuffers() { |
| 500 base::TimeTicks start_time = base::TimeTicks::Now(); | 500 base::TimeTicks start_time = base::TimeTicks::Now(); |
| 501 FOR_EACH_OBSERVER(CompositorObserver, observer_list_, | 501 FOR_EACH_OBSERVER(CompositorObserver, observer_list_, |
| 502 OnCompositingStarted(this, start_time)); | 502 OnCompositingStarted(this, start_time)); |
| 503 } | 503 } |
| 504 | 504 |
| (...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 544 observer_list_, | 544 observer_list_, |
| 545 OnCompositingLockStateChanged(this)); | 545 OnCompositingLockStateChanged(this)); |
| 546 } | 546 } |
| 547 | 547 |
| 548 void Compositor::CancelCompositorLock() { | 548 void Compositor::CancelCompositorLock() { |
| 549 if (compositor_lock_) | 549 if (compositor_lock_) |
| 550 compositor_lock_->CancelLock(); | 550 compositor_lock_->CancelLock(); |
| 551 } | 551 } |
| 552 | 552 |
| 553 } // namespace ui | 553 } // namespace ui |
| OLD | NEW |