Chromium Code Reviews| Index: ui/compositor/transform_animation_curve_adapter.cc |
| diff --git a/ui/compositor/transform_animation_curve_adapter.cc b/ui/compositor/transform_animation_curve_adapter.cc |
| index 1b67ca20860ece67a378dc31972dc05da680fa83..759cd62d2a81bdb66bed8fc5ad9051ea9373cd09 100644 |
| --- a/ui/compositor/transform_animation_curve_adapter.cc |
| +++ b/ui/compositor/transform_animation_curve_adapter.cc |
| @@ -69,6 +69,12 @@ bool TransformAnimationCurveAdapter::IsTranslation() const { |
| target_value_.IsIdentityOrTranslation(); |
| } |
| +bool TransformAnimationCurveAdapter::PreservesAxisAlignment() const { |
| + return (initial_value_.IsIdentity() || |
| + initial_value_.IsScaleOrTranslation()) && |
| + (target_value_.IsScaleOrTranslation()); |
|
enne (OOO)
2014/12/15 22:46:51
What if the target value is identity?
awoloszyn
2014/12/16 15:50:44
Done.
|
| +} |
| + |
| bool TransformAnimationCurveAdapter::MaximumTargetScale( |
| bool forward_direction, |
| float* max_scale) const { |
| @@ -131,6 +137,12 @@ bool InverseTransformCurveAdapter::IsTranslation() const { |
| base_curve_.IsTranslation(); |
| } |
| +bool InverseTransformCurveAdapter::PreservesAxisAlignment() const { |
| + return (initial_value_.IsIdentity() || |
| + initial_value_.IsScaleOrTranslation()) && |
| + (base_curve_.PreservesAxisAlignment()); |
| +} |
| + |
| bool InverseTransformCurveAdapter::MaximumTargetScale(bool forward_direction, |
| float* max_scale) const { |
| return false; |