| Index: cc/animation/transform_operations.cc
|
| diff --git a/cc/animation/transform_operations.cc b/cc/animation/transform_operations.cc
|
| index 970eb0dd455a7595d7e2304fec4f766f5f996293..fb1c17d517598e3c23af197d72996558d02e70a9 100644
|
| --- a/cc/animation/transform_operations.cc
|
| +++ b/cc/animation/transform_operations.cc
|
| @@ -163,16 +163,14 @@ bool TransformOperations::ScaleComponent(gfx::Vector3dF* scale) const {
|
| }
|
|
|
| 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;
|
| }
|
|
|
|
|