Transform animations should not collapse by default when interpolating

ui/compositor/transform_animation_curve_adapter.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef UI_COMPOSITOR_TRANSFORM_ANIMATION_CURVE_ADAPTER_H_
 #define UI_COMPOSITOR_TRANSFORM_ANIMATION_CURVE_ADAPTER_H_
 
 #include <memory>
 
 #include "base/macros.h"
 #include "base/time/time.h"
 #include "cc/animation/animation_curve.h"
+#include "cc/animation/transform_operations.h"
 #include "ui/compositor/compositor_export.h"
 #include "ui/gfx/animation/tween.h"
 #include "ui/gfx/transform.h"
 #include "ui/gfx/transform_util.h"
 
 namespace ui {
 
 class COMPOSITOR_EXPORT TransformAnimationCurveAdapter
     : public cc::TransformAnimationCurve {
  public:
   TransformAnimationCurveAdapter(gfx::Tween::Type tween_type,
                                  gfx::Transform intial_value,
                                  gfx::Transform target_value,
                                  base::TimeDelta duration);
 
   TransformAnimationCurveAdapter(const TransformAnimationCurveAdapter& other);
 
   ~TransformAnimationCurveAdapter() override;
 
   // TransformAnimationCurve implementation.
   base::TimeDelta Duration() const override;
   std::unique_ptr<AnimationCurve> Clone() const override;
-  gfx::Transform GetValue(base::TimeDelta t) const override;
+  cc::TransformOperations GetValue(base::TimeDelta t) const override;
   bool AnimatedBoundsForBox(const gfx::BoxF& box,
                             gfx::BoxF* bounds) const override;
   bool IsTranslation() const override;
   bool PreservesAxisAlignment() const override;
   bool AnimationStartScale(bool forward_direction,
                            float* start_scale) const override;
   bool MaximumTargetScale(bool forward_direction,
                           float* max_scale) const override;
 
  private:
   gfx::Tween::Type tween_type_;
   gfx::Transform initial_value_;
+  cc::TransformOperations initial_wrapped_value_;
   gfx::Transform target_value_;
+  cc::TransformOperations target_wrapped_value_;
   gfx::DecomposedTransform decomposed_initial_value_;
   gfx::DecomposedTransform decomposed_target_value_;
   base::TimeDelta duration_;
 
   DISALLOW_ASSIGN(TransformAnimationCurveAdapter);
 };
 
 class COMPOSITOR_EXPORT InverseTransformCurveAdapter
     : public cc::TransformAnimationCurve {
  public:
   InverseTransformCurveAdapter(TransformAnimationCurveAdapter base_curve,
                                gfx::Transform initial_value,
                                base::TimeDelta duration);
 
   ~InverseTransformCurveAdapter() override;
 
   base::TimeDelta Duration() const override;
   std::unique_ptr<AnimationCurve> Clone() const override;
-  gfx::Transform GetValue(base::TimeDelta t) const override;
+  cc::TransformOperations GetValue(base::TimeDelta t) const override;
   bool AnimatedBoundsForBox(const gfx::BoxF& box,
                             gfx::BoxF* bounds) const override;
   bool IsTranslation() const override;
   bool PreservesAxisAlignment() const override;
   bool AnimationStartScale(bool forward_direction,
                            float* start_scale) const override;
   bool MaximumTargetScale(bool forward_direction,
                           float* max_scale) const override;
 
  private:
   TransformAnimationCurveAdapter base_curve_;
   gfx::Transform initial_value_;
+  cc::TransformOperations initial_wrapped_value_;
   gfx::Transform effective_initial_value_;
   base::TimeDelta duration_;
 
   DISALLOW_ASSIGN(InverseTransformCurveAdapter);
 };
 
 }  // namespace ui
 
 #endif  // UI_COMPOSITOR_TRANSFORM_ANIMATION_CURVE_ADAPTER_H_