| 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/layer_animator.h" | 5 #include "ui/compositor/layer_animator.h" |
| 6 | 6 |
| 7 #include <stddef.h> | 7 #include <stddef.h> |
| 8 | 8 |
| 9 #include <memory> | 9 #include <memory> |
| 10 | 10 |
| (...skipping 97 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 108 } | 108 } |
| 109 | 109 |
| 110 ANIMATED_PROPERTY( | 110 ANIMATED_PROPERTY( |
| 111 const gfx::Transform&, TRANSFORM, Transform, gfx::Transform, transform); | 111 const gfx::Transform&, TRANSFORM, Transform, gfx::Transform, transform); |
| 112 ANIMATED_PROPERTY(const gfx::Rect&, BOUNDS, Bounds, gfx::Rect, bounds); | 112 ANIMATED_PROPERTY(const gfx::Rect&, BOUNDS, Bounds, gfx::Rect, bounds); |
| 113 ANIMATED_PROPERTY(float, OPACITY, Opacity, float, opacity); | 113 ANIMATED_PROPERTY(float, OPACITY, Opacity, float, opacity); |
| 114 ANIMATED_PROPERTY(bool, VISIBILITY, Visibility, bool, visibility); | 114 ANIMATED_PROPERTY(bool, VISIBILITY, Visibility, bool, visibility); |
| 115 ANIMATED_PROPERTY(float, BRIGHTNESS, Brightness, float, brightness); | 115 ANIMATED_PROPERTY(float, BRIGHTNESS, Brightness, float, brightness); |
| 116 ANIMATED_PROPERTY(float, GRAYSCALE, Grayscale, float, grayscale); | 116 ANIMATED_PROPERTY(float, GRAYSCALE, Grayscale, float, grayscale); |
| 117 ANIMATED_PROPERTY(SkColor, COLOR, Color, SkColor, color); | 117 ANIMATED_PROPERTY(SkColor, COLOR, Color, SkColor, color); |
| 118 ANIMATED_PROPERTY(float, TEMPERATURE, Temperature, float, temperature); |
| 118 | 119 |
| 119 base::TimeDelta LayerAnimator::GetTransitionDuration() const { | 120 base::TimeDelta LayerAnimator::GetTransitionDuration() const { |
| 120 return transition_duration_; | 121 return transition_duration_; |
| 121 } | 122 } |
| 122 | 123 |
| 123 void LayerAnimator::SetDelegate(LayerAnimationDelegate* delegate) { | 124 void LayerAnimator::SetDelegate(LayerAnimationDelegate* delegate) { |
| 124 if (delegate_ && is_started_) { | 125 if (delegate_ && is_started_) { |
| 125 LayerAnimatorCollection* collection = GetLayerAnimatorCollection(); | 126 LayerAnimatorCollection* collection = GetLayerAnimatorCollection(); |
| 126 if (collection) | 127 if (collection) |
| 127 collection->StopAnimator(this); | 128 collection->StopAnimator(this); |
| (...skipping 806 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 934 const base::WeakPtr<LayerAnimationSequence>& sequence) | 935 const base::WeakPtr<LayerAnimationSequence>& sequence) |
| 935 : sequence_(sequence) { | 936 : sequence_(sequence) { |
| 936 } | 937 } |
| 937 | 938 |
| 938 LayerAnimator::RunningAnimation::RunningAnimation( | 939 LayerAnimator::RunningAnimation::RunningAnimation( |
| 939 const RunningAnimation& other) = default; | 940 const RunningAnimation& other) = default; |
| 940 | 941 |
| 941 LayerAnimator::RunningAnimation::~RunningAnimation() { } | 942 LayerAnimator::RunningAnimation::~RunningAnimation() { } |
| 942 | 943 |
| 943 } // namespace ui | 944 } // namespace ui |
| OLD | NEW |