Matrix decomposition for mismatched functions in keyframes

cc/animation/transform_operations.cc

 // 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.
 
 #include "cc/animation/transform_operations.h"
 
 #include <algorithm>
 
 #include "ui/gfx/animation/tween.h"
 #include "ui/gfx/geometry/box_f.h"
@@ skipping 145 matching lines @@
         has_scale_component = true;
         scale->Scale(operations_[i].scale.x,
                      operations_[i].scale.y,
                      operations_[i].scale.z);
     }
   }
   return true;
 }
 
 bool TransformOperations::MatchesTypes(const TransformOperations& other) const {
-  if (IsIdentity() || other.IsIdentity())
+  if (operations_.size() == 0 || other.operations_.size() == 0)
     return true;
 
   if (operations_.size() != other.operations_.size())
     return false;
 
   for (size_t i = 0; i < operations_.size(); ++i) {
-    if (operations_[i].type != other.operations_[i].type
-      && !operations_[i].IsIdentity()
-      && !other.operations_[i].IsIdentity())
+    if (operations_[i].type != other.operations_[i].type)
       return false;
   }
 
   return true;
 }
 
 bool TransformOperations::CanBlendWith(
     const TransformOperations& other) const {
   gfx::Transform dummy;
   return BlendInternal(other, 0.5, &dummy);
@@ skipping 123 matching lines @@
       decomposed_transform_.reset(new gfx::DecomposedTransform());
     gfx::Transform transform = Apply();
     if (!gfx::DecomposeTransform(decomposed_transform_.get(), transform))
       return false;
     decomposed_transform_dirty_ = false;
   }
   return true;
 }
 
 }  // namespace cc