diff options
| author | jamesr@chromium.org <jamesr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-26 21:15:06 +0000 |
|---|---|---|
| committer | jamesr@chromium.org <jamesr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-26 21:15:06 +0000 |
| commit | bf691c24ca3cf0ebbe8c82e871b4b05bd4256f6d (patch) | |
| tree | dba84d59df6abc81803ce0191ccb78c42d4ca55b /cc/animation/transform_operation.cc | |
| parent | 01fc514f488305c0c57038c3d5c7b28eb09df4cd (diff) | |
| download | chromium_src-bf691c24ca3cf0ebbe8c82e871b4b05bd4256f6d.zip chromium_src-bf691c24ca3cf0ebbe8c82e871b4b05bd4256f6d.tar.gz chromium_src-bf691c24ca3cf0ebbe8c82e871b4b05bd4256f6d.tar.bz2 | |
Fix cpplint errors in cc/(animation|input|layers|trees|test)/
This fixes lint errors in everything except for the few stragglers (occlusion unit test, etc) that haven't been chromified.
BUG=144577
Review URL: https://chromiumcodereview.appspot.com/12965007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@190767 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'cc/animation/transform_operation.cc')
| -rw-r--r-- | cc/animation/transform_operation.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cc/animation/transform_operation.cc b/cc/animation/transform_operation.cc index 65769b4..b4e6917 100644 --- a/cc/animation/transform_operation.cc +++ b/cc/animation/transform_operation.cc @@ -115,10 +115,10 @@ bool TransformOperation::BlendTransformOperations( double axis_z = 1; double from_angle = 0; double to_angle = IsOperationIdentity(to) ? 0 : to->rotate.angle; - if (ShareSameAxis(from, to, axis_x, axis_y, axis_z, from_angle)) + if (ShareSameAxis(from, to, axis_x, axis_y, axis_z, from_angle)) { result.RotateAbout(gfx::Vector3dF(axis_x, axis_y, axis_z), BlendDoubles(from_angle, to_angle, progress)); - else { + } else { gfx::Transform to_matrix; if (!IsOperationIdentity(to)) to_matrix = to->matrix; |