Index: cc/keyframed_animation_curve_unittest.cc |
diff --git a/cc/keyframed_animation_curve_unittest.cc b/cc/keyframed_animation_curve_unittest.cc |
index 6e6eea9b94091b729b1d8e9231e26866b3c0a5be..604fbde53e5797593b842bc8938b0463369b26f1 100644 |
--- a/cc/keyframed_animation_curve_unittest.cc |
+++ b/cc/keyframed_animation_curve_unittest.cc |
@@ -4,17 +4,18 @@ |
#include "cc/keyframed_animation_curve.h" |
+#include <public/WebTransformOperations.h> |
danakj
2012/11/24 02:34:54
can undo all the changes in this file
|
+ |
#include "testing/gmock/include/gmock/gmock.h" |
#include "testing/gtest/include/gtest/gtest.h" |
-#include <public/WebTransformOperations.h> |
-#include <public/WebTransformationMatrix.h> |
+#include "ui/gfx/transform.h" |
-using WebKit::WebTransformationMatrix; |
+using gfx::Transform; |
namespace cc { |
namespace { |
-void expectTranslateX(double translateX, const WebTransformationMatrix& matrix) |
+void expectTranslateX(double translateX, const WebKit::WebTransformationMatrix& matrix) |
{ |
EXPECT_FLOAT_EQ(translateX, matrix.m41()); |
} |
@@ -161,7 +162,7 @@ TEST(KeyframedAnimationCurveTest, RepeatedTransformKeyTimes) |
expectTranslateX(4, curve->getValue(0.5)); |
// There is a discontinuity at 1. Any value between 4 and 6 is valid. |
- WebTransformationMatrix value = curve->getValue(1); |
+ WebKit::WebTransformationMatrix value = curve->getValue(1); |
EXPECT_TRUE(value.m41() >= 4 && value.m41() <= 6); |
expectTranslateX(6, curve->getValue(1.5)); |