Index: cc/layer_animation_controller.cc |
diff --git a/cc/layer_animation_controller.cc b/cc/layer_animation_controller.cc |
index d5ed278bc57932638f4de36a9a67dc26f2399e3f..8efcc4f93c57db5698b7bbd850ac98dc033f09a6 100644 |
--- a/cc/layer_animation_controller.cc |
+++ b/cc/layer_animation_controller.cc |
@@ -13,30 +13,6 @@ |
#include "cc/scoped_ptr_algorithm.h" |
#include "ui/gfx/transform.h" |
-namespace { |
-gfx::Transform convertWebTransformationMatrixToTransform(const WebKit::WebTransformationMatrix& matrix) |
-{ |
- gfx::Transform transform; |
- transform.matrix().setDouble(0, 0, matrix.m11()); |
- transform.matrix().setDouble(0, 1, matrix.m21()); |
- transform.matrix().setDouble(0, 2, matrix.m31()); |
- transform.matrix().setDouble(0, 3, matrix.m41()); |
- transform.matrix().setDouble(1, 0, matrix.m12()); |
- transform.matrix().setDouble(1, 1, matrix.m22()); |
- transform.matrix().setDouble(1, 2, matrix.m32()); |
- transform.matrix().setDouble(1, 3, matrix.m42()); |
- transform.matrix().setDouble(2, 0, matrix.m13()); |
- transform.matrix().setDouble(2, 1, matrix.m23()); |
- transform.matrix().setDouble(2, 2, matrix.m33()); |
- transform.matrix().setDouble(2, 3, matrix.m43()); |
- transform.matrix().setDouble(3, 0, matrix.m14()); |
- transform.matrix().setDouble(3, 1, matrix.m24()); |
- transform.matrix().setDouble(3, 2, matrix.m34()); |
- transform.matrix().setDouble(3, 3, matrix.m44()); |
- return transform; |
-} |
-} // namespace |
- |
namespace cc { |
LayerAnimationController::LayerAnimationController(int id) |
@@ -443,7 +419,7 @@ void LayerAnimationController::tickAnimations(double monotonicTime) |
case Animation::Transform: { |
const TransformAnimationCurve* transformAnimationCurve = m_activeAnimations[i]->curve()->toTransformAnimationCurve(); |
- const gfx::Transform transform = convertWebTransformationMatrixToTransform(transformAnimationCurve->getValue(trimmed)); |
+ const gfx::Transform transform = transformAnimationCurve->getValue(trimmed); |
if (m_activeAnimations[i]->isFinishedAt(monotonicTime)) |
m_activeAnimations[i]->setRunState(Animation::Finished, monotonicTime); |