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_LAYER_ANIMATION_ELEMENT_H_ | 5 #ifndef UI_COMPOSITOR_LAYER_ANIMATION_ELEMENT_H_ |
6 #define UI_COMPOSITOR_LAYER_ANIMATION_ELEMENT_H_ | 6 #define UI_COMPOSITOR_LAYER_ANIMATION_ELEMENT_H_ |
7 | 7 |
8 #include <stdint.h> | 8 #include <stdint.h> |
9 | 9 |
10 #include <set> | 10 #include <set> |
(...skipping 27 matching lines...) Expand all Loading... |
38 BRIGHTNESS = (1 << 4), | 38 BRIGHTNESS = (1 << 4), |
39 GRAYSCALE = (1 << 5), | 39 GRAYSCALE = (1 << 5), |
40 COLOR = (1 << 6), | 40 COLOR = (1 << 6), |
41 | 41 |
42 // Used when iterating over properties. | 42 // Used when iterating over properties. |
43 FIRST_PROPERTY = TRANSFORM, | 43 FIRST_PROPERTY = TRANSFORM, |
44 SENTINEL = (1 << 7) | 44 SENTINEL = (1 << 7) |
45 }; | 45 }; |
46 | 46 |
47 static AnimatableProperty ToAnimatableProperty( | 47 static AnimatableProperty ToAnimatableProperty( |
48 cc::Animation::TargetProperty property); | 48 cc::TargetProperty::Type property); |
49 | 49 |
50 struct COMPOSITOR_EXPORT TargetValue { | 50 struct COMPOSITOR_EXPORT TargetValue { |
51 TargetValue(); | 51 TargetValue(); |
52 // Initializes the target value to match the delegate. NULL may be supplied. | 52 // Initializes the target value to match the delegate. NULL may be supplied. |
53 explicit TargetValue(const LayerAnimationDelegate* delegate); | 53 explicit TargetValue(const LayerAnimationDelegate* delegate); |
54 | 54 |
55 gfx::Rect bounds; | 55 gfx::Rect bounds; |
56 gfx::Transform transform; | 56 gfx::Transform transform; |
57 float opacity; | 57 float opacity; |
58 bool visibility; | 58 bool visibility; |
(...skipping 181 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
240 double last_progressed_fraction_; | 240 double last_progressed_fraction_; |
241 | 241 |
242 base::WeakPtrFactory<LayerAnimationElement> weak_ptr_factory_; | 242 base::WeakPtrFactory<LayerAnimationElement> weak_ptr_factory_; |
243 | 243 |
244 DISALLOW_ASSIGN(LayerAnimationElement); | 244 DISALLOW_ASSIGN(LayerAnimationElement); |
245 }; | 245 }; |
246 | 246 |
247 } // namespace ui | 247 } // namespace ui |
248 | 248 |
249 #endif // UI_COMPOSITOR_LAYER_ANIMATION_ELEMENT_H_ | 249 #endif // UI_COMPOSITOR_LAYER_ANIMATION_ELEMENT_H_ |
OLD | NEW |