summaryrefslogtreecommitdiffstats
path: root/cc/animation/keyframed_animation_curve_unittest.cc
diff options
context:
space:
mode:
authorenne@chromium.org <enne@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-09-23 16:29:10 +0000
committerenne@chromium.org <enne@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-09-23 16:29:10 +0000
commit0a1ddcf7f886e131494eea3d0d82e8cbc584cc1e (patch)
tree853f61d6073a5901eba2f5ebef07078142a06ead /cc/animation/keyframed_animation_curve_unittest.cc
parent9deff69f1dd3701d94c8c235c53578c2d627f3dc (diff)
downloadchromium_src-0a1ddcf7f886e131494eea3d0d82e8cbc584cc1e.zip
chromium_src-0a1ddcf7f886e131494eea3d0d82e8cbc584cc1e.tar.gz
chromium_src-0a1ddcf7f886e131494eea3d0d82e8cbc584cc1e.tar.bz2
Fix compilation and ui_unittests with float transforms
This change also cleans up the use of gfx::Transform::get/setDouble (in favor of get/set) at callsites to prepare for changing SkMScalar from double to float. BUG=269817 Review URL: https://chromiumcodereview.appspot.com/23811009 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@224725 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'cc/animation/keyframed_animation_curve_unittest.cc')
-rw-r--r--cc/animation/keyframed_animation_curve_unittest.cc8
1 files changed, 4 insertions, 4 deletions
diff --git a/cc/animation/keyframed_animation_curve_unittest.cc b/cc/animation/keyframed_animation_curve_unittest.cc
index 48f511c0..7eb3b1c 100644
--- a/cc/animation/keyframed_animation_curve_unittest.cc
+++ b/cc/animation/keyframed_animation_curve_unittest.cc
@@ -12,8 +12,8 @@
namespace cc {
namespace {
-void ExpectTranslateX(double translate_x, const gfx::Transform& transform) {
- EXPECT_FLOAT_EQ(translate_x, transform.matrix().getDouble(0, 3));
+void ExpectTranslateX(SkMScalar translate_x, const gfx::Transform& transform) {
+ EXPECT_FLOAT_EQ(translate_x, transform.matrix().get(0, 3));
}
void ExpectBrightness(double brightness, const FilterOperations& filter) {
@@ -185,8 +185,8 @@ TEST(KeyframedAnimationCurveTest, RepeatedTransformKeyTimes) {
// There is a discontinuity at 1. Any value between 4 and 6 is valid.
gfx::Transform value = curve->GetValue(1.f);
- EXPECT_GE(value.matrix().getDouble(0.f, 3.f), 4);
- EXPECT_LE(value.matrix().getDouble(0.f, 3.f), 6);
+ EXPECT_GE(value.matrix().get(0, 3), 4.f);
+ EXPECT_LE(value.matrix().get(0, 3), 6.f);
ExpectTranslateX(6.f, curve->GetValue(1.5f));
ExpectTranslateX(6.f, curve->GetValue(2.f));