Transform animations should not collapse by default when interpolating

cc/animation/transform_operation.h

 // Copyright 2013 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 CC_ANIMATION_TRANSFORM_OPERATION_H_
 #define CC_ANIMATION_TRANSFORM_OPERATION_H_
 
 #include "ui/gfx/transform.h"
 
 namespace gfx {
@@ skipping 36 matching lines @@
     struct {
       struct {
         SkMScalar x, y, z;
       } axis;
 
       SkMScalar angle;
     } rotate;
   };
 
   bool IsIdentity() const;
+
+  // Sets |matrix| based on type and the union values.
+  void Bake();
+
   static bool BlendTransformOperations(const TransformOperation* from,
                                        const TransformOperation* to,
                                        SkMScalar progress,
-                                       gfx::Transform* result);
+                                       TransformOperation* result);
 
   static bool BlendedBoundsForBox(const gfx::BoxF& box,
                                   const TransformOperation* from,
                                   const TransformOperation* to,
                                   SkMScalar min_progress,
                                   SkMScalar max_progress,
                                   gfx::BoxF* bounds);
 };
 
 }  // namespace cc
 
 #endif  // CC_ANIMATION_TRANSFORM_OPERATION_H_