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

Unified Diff: cc/animation/transform_operation.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 | « no previous file | cc/animation/transform_operations.cc » ('j') | cc/animation/transform_operations.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/animation/transform_operation.cc
diff --git a/cc/animation/transform_operation.cc b/cc/animation/transform_operation.cc
index 7421924aedcea56ef9658d47bc2e4c77225404d2..e487921cdb4ba3aa85a0a1054b58811f552c793d 100644
--- a/cc/animation/transform_operation.cc
+++ b/cc/animation/transform_operation.cc
@@ -41,7 +41,7 @@ static bool ShareSameAxis(const TransformOperation* from,
if (IsOperationIdentity(from) && IsOperationIdentity(to))
return false;
- if (IsOperationIdentity(from) && !IsOperationIdentity(to)) {
+ if (!from && !IsOperationIdentity(to)) {
*axis_x = to->rotate.axis.x;
*axis_y = to->rotate.axis.y;
*axis_z = to->rotate.axis.z;
@@ -49,7 +49,7 @@ static bool ShareSameAxis(const TransformOperation* from,
return true;
}
- if (!IsOperationIdentity(from) && IsOperationIdentity(to)) {
+ if (!IsOperationIdentity(from) && !to) {
*axis_x = from->rotate.axis.x;
*axis_y = from->rotate.axis.y;
*axis_z = from->rotate.axis.z;
« no previous file with comments | « no previous file | cc/animation/transform_operations.cc » ('j') | cc/animation/transform_operations.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698