| Index: cc/layer_animation_controller.cc
|
| diff --git a/cc/layer_animation_controller.cc b/cc/layer_animation_controller.cc
|
| index 2dbdde8249eb3b734cfed1cadda16e8559b000d7..805f8fc264d5fbf7fae71609a0a77241a662caeb 100644
|
| --- a/cc/layer_animation_controller.cc
|
| +++ b/cc/layer_animation_controller.cc
|
| @@ -6,9 +6,7 @@
|
|
|
| #include "cc/active_animation.h"
|
| #include "cc/keyframed_animation_curve.h"
|
| -#include <public/WebTransformationMatrix.h>
|
| -
|
| -using WebKit::WebTransformationMatrix;
|
| +#include "ui/gfx/transform.h"
|
|
|
| namespace cc {
|
|
|
| @@ -373,7 +371,7 @@ void LayerAnimationController::tickAnimations(double monotonicTime)
|
|
|
| case ActiveAnimation::Transform: {
|
| const TransformAnimationCurve* transformAnimationCurve = m_activeAnimations[i]->curve()->toTransformAnimationCurve();
|
| - const WebTransformationMatrix matrix = transformAnimationCurve->getValue(trimmed);
|
| + const gfx::Transform matrix = transformAnimationCurve->getValue(trimmed).toTransform();
|
| if (m_activeAnimations[i]->isFinishedAt(monotonicTime))
|
| m_activeAnimations[i]->setRunState(ActiveAnimation::Finished, monotonicTime);
|
|
|
|
|