diff options
| author | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-09-23 17:15:38 +0000 |
|---|---|---|
| committer | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-09-23 17:15:38 +0000 |
| commit | 7852a5066d2b6c1d552cb40cd918a39b1eee4de0 (patch) | |
| tree | 62956fb9cbef939657a49c709ccfdc3877e1926b /cc/animation | |
| parent | 9c01c3700505881089954e65a3fed60d1b85b5fd (diff) | |
| download | chromium_src-7852a5066d2b6c1d552cb40cd918a39b1eee4de0.zip chromium_src-7852a5066d2b6c1d552cb40cd918a39b1eee4de0.tar.gz chromium_src-7852a5066d2b6c1d552cb40cd918a39b1eee4de0.tar.bz2 | |
Revert 224725 "Fix compilation and ui_unittests with float trans..."
Reverting as caused perf regression because of new static
initializers.
> 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
TBR=enne@chromium.org
Review URL: https://codereview.chromium.org/23537065
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@224732 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'cc/animation')
| -rw-r--r-- | cc/animation/keyframed_animation_curve_unittest.cc | 8 | ||||
| -rw-r--r-- | cc/animation/transform_operation.cc | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/cc/animation/keyframed_animation_curve_unittest.cc b/cc/animation/keyframed_animation_curve_unittest.cc index 7eb3b1c..48f511c0 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(SkMScalar translate_x, const gfx::Transform& transform) { - EXPECT_FLOAT_EQ(translate_x, transform.matrix().get(0, 3)); +void ExpectTranslateX(double translate_x, const gfx::Transform& transform) { + EXPECT_FLOAT_EQ(translate_x, transform.matrix().getDouble(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().get(0, 3), 4.f); - EXPECT_LE(value.matrix().get(0, 3), 6.f); + EXPECT_GE(value.matrix().getDouble(0.f, 3.f), 4); + EXPECT_LE(value.matrix().getDouble(0.f, 3.f), 6); ExpectTranslateX(6.f, curve->GetValue(1.5f)); ExpectTranslateX(6.f, curve->GetValue(2.f)); diff --git a/cc/animation/transform_operation.cc b/cc/animation/transform_operation.cc index a9fd44fb..93f40f3 100644 --- a/cc/animation/transform_operation.cc +++ b/cc/animation/transform_operation.cc @@ -12,7 +12,7 @@ #include "ui/gfx/vector3d_f.h" namespace { -const SkMScalar kAngleEpsilon = SkDoubleToMScalar(1e-4); +const SkMScalar kAngleEpsilon = 1e-4; } namespace cc { |