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 "ash/wm/window_animations.h" | 5 #include "ash/wm/window_animations.h" |
6 | 6 |
7 #include <math.h> | 7 #include <math.h> |
8 | 8 |
9 #include <algorithm> | 9 #include <algorithm> |
10 #include <vector> | 10 #include <vector> |
(...skipping 548 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
559 : window_(window), | 559 : window_(window), |
560 layer_(layer) { | 560 layer_(layer) { |
561 window_->AddObserver(this); | 561 window_->AddObserver(this); |
562 layer_->GetCompositor()->AddObserver(this); | 562 layer_->GetCompositor()->AddObserver(this); |
563 } | 563 } |
564 virtual ~CrossFadeObserver() { | 564 virtual ~CrossFadeObserver() { |
565 Cleanup(); | 565 Cleanup(); |
566 } | 566 } |
567 | 567 |
568 // ui::CompositorObserver overrides: | 568 // ui::CompositorObserver overrides: |
| 569 virtual void OnCompositingDidCommit(ui::Compositor* compositor) OVERRIDE { |
| 570 } |
569 virtual void OnCompositingWillStart(ui::Compositor* compositor) OVERRIDE { | 571 virtual void OnCompositingWillStart(ui::Compositor* compositor) OVERRIDE { |
570 } | 572 } |
571 virtual void OnCompositingStarted(ui::Compositor* compositor) OVERRIDE { | 573 virtual void OnCompositingStarted(ui::Compositor* compositor) OVERRIDE { |
572 } | 574 } |
573 virtual void OnCompositingEnded(ui::Compositor* compositor) OVERRIDE { | 575 virtual void OnCompositingEnded(ui::Compositor* compositor) OVERRIDE { |
574 } | 576 } |
575 virtual void OnCompositingAborted(ui::Compositor* compositor) OVERRIDE { | 577 virtual void OnCompositingAborted(ui::Compositor* compositor) OVERRIDE { |
576 // Something went wrong with compositing and our layers are now invalid. | 578 // Something went wrong with compositing and our layers are now invalid. |
577 if (layer_) | 579 if (layer_) |
578 layer_->GetAnimator()->StopAnimating(); | 580 layer_->GetAnimator()->StopAnimating(); |
(...skipping 197 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
776 AnimateHideWindow(window); | 778 AnimateHideWindow(window); |
777 } | 779 } |
778 } | 780 } |
779 | 781 |
780 void SetDelayedOldLayerDeletionInCrossFadeForTest(bool value) { | 782 void SetDelayedOldLayerDeletionInCrossFadeForTest(bool value) { |
781 delayed_old_layer_deletion_in_cross_fade_for_test_ = value; | 783 delayed_old_layer_deletion_in_cross_fade_for_test_ = value; |
782 } | 784 } |
783 | 785 |
784 } // namespace internal | 786 } // namespace internal |
785 } // namespace ash | 787 } // namespace ash |
OLD | NEW |