diff options
| author | danakj <danakj@chromium.org> | 2015-10-21 11:14:19 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-10-21 18:15:11 +0000 |
| commit | 8864f4c7beb7f0e341bc622d917ed6af3b332584 (patch) | |
| tree | 6c0167a6ee004fbed198c87cdb253c9933be5115 /ash | |
| parent | 2d758574a12f5f5c18218687f32bc6a9e218fca9 (diff) | |
| download | chromium_src-8864f4c7beb7f0e341bc622d917ed6af3b332584.zip chromium_src-8864f4c7beb7f0e341bc622d917ed6af3b332584.tar.gz chromium_src-8864f4c7beb7f0e341bc622d917ed6af3b332584.tar.bz2 | |
Remove implicit Point to PointF conversion in InterpolatedTransform.
The InterpolatedTransform stores a PointF, so take a PointF in its
constructor, and fix callsites to pass a PointF.
R=sky
BUG=342848
Review URL: https://codereview.chromium.org/1410593008
Cr-Commit-Position: refs/heads/master@{#355341}
Diffstat (limited to 'ash')
| -rw-r--r-- | ash/rotator/window_rotation.cc | 4 | ||||
| -rw-r--r-- | ash/wm/window_animations.cc | 5 |
2 files changed, 4 insertions, 5 deletions
diff --git a/ash/rotator/window_rotation.cc b/ash/rotator/window_rotation.cc index a82d4ac..b64477d 100644 --- a/ash/rotator/window_rotation.cc +++ b/ash/rotator/window_rotation.cc @@ -83,8 +83,8 @@ void WindowRotation::InitTransform(ui::Layer* layer) { scoped_ptr<ui::InterpolatedTransform> translation( new ui::InterpolatedTranslation( - gfx::Point(0, 0), gfx::Point(new_pivot.x() - old_pivot.x(), - new_pivot.y() - old_pivot.y()))); + gfx::PointF(), gfx::PointF(new_pivot.x() - old_pivot.x(), + new_pivot.y() - old_pivot.y()))); float scale_factor = 0.9f; scoped_ptr<ui::InterpolatedTransform> scale_down( diff --git a/ash/wm/window_animations.cc b/ash/wm/window_animations.cc index dbd8bf3..277f537 100644 --- a/ash/wm/window_animations.cc +++ b/ash/wm/window_animations.cc @@ -112,9 +112,8 @@ void AddLayerAnimationsForMinimize(aura::Window* window, bool show) { scoped_ptr<ui::InterpolatedTransform> translation( new ui::InterpolatedTranslation( - gfx::Point(), - gfx::Point(target_bounds.x() - bounds.x(), - target_bounds.y() - bounds.y()))); + gfx::PointF(), gfx::PointF(target_bounds.x() - bounds.x(), + target_bounds.y() - bounds.y()))); scale->SetChild(translation.release()); scale->SetReversed(show); |