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

Unified Diff: cc/animation/transform_operations.cc

Issue 1194073007: Fix for bug where composited rotate3d should SLERP (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Corrected checks in ShareSameAxis 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 | « cc/animation/transform_operation.cc ('k') | 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 fb1c17d517598e3c23af197d72996558d02e70a9..6631a2a980b0eefa426ed4582ec68a231156fd8c 100644
--- a/cc/animation/transform_operations.cc
+++ b/cc/animation/transform_operations.cc
@@ -277,10 +277,9 @@ bool TransformOperations::BlendInternal(const TransformOperations& from,
for (size_t i = 0; i < num_operations; ++i) {
gfx::Transform blended;
if (!TransformOperation::BlendTransformOperations(
- from_identity ? 0 : &from.operations_[i],
- to_identity ? 0 : &operations_[i],
- progress,
- &blended))
+ from.operations_.size() <= i ? 0 : &from.operations_[i],
+ operations_.size() <= i ? 0 : &operations_[i], progress,
ajuma 2015/06/24 14:47:45 Please add a test for this change too.
soonm 2015/06/26 07:48:38 The new tests I've added for the corrected shareSa
ajuma 2015/06/26 13:13:31 Ah, of course, thanks for the explanation!
+ &blended))
return false;
result->PreconcatTransform(blended);
}
« no previous file with comments | « cc/animation/transform_operation.cc ('k') | cc/animation/transform_operations_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698