Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(4100)

Unified Diff: cc/animation/transform_operations.cc

Issue 1170953002: Matrix decomposition for mismatched functions in keyframes (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixing unit_tests Created 5 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | cc/animation/transform_operations_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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;
}
« no previous file with comments | « no previous file | cc/animation/transform_operations_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698