summaryrefslogtreecommitdiffstats
path: root/ash
diff options
context:
space:
mode:
authordanakj <danakj@chromium.org>2015-10-20 17:09:19 -0700
committerCommit bot <commit-bot@chromium.org>2015-10-21 00:10:36 +0000
commit49a362d9c02940c14af24d682cfe51b1a41b0462 (patch)
treefdddd780dee3ccc823c9eab9d6c8220b1a451400 /ash
parent1a60e3f66f9f1c6ba4e1f35222026e5d8130c977 (diff)
downloadchromium_src-49a362d9c02940c14af24d682cfe51b1a41b0462.zip
chromium_src-49a362d9c02940c14af24d682cfe51b1a41b0462.tar.gz
chromium_src-49a362d9c02940c14af24d682cfe51b1a41b0462.tar.bz2
magnifier: Make conversions from gfx::Point to PointF explicit.
This implicit conversion operator will be going away. R=oshima BUG=342848 Review URL: https://codereview.chromium.org/1415853003 Cr-Commit-Position: refs/heads/master@{#355192}
Diffstat (limited to 'ash')
-rw-r--r--ash/magnifier/magnification_controller.cc16
1 files changed, 8 insertions, 8 deletions
diff --git a/ash/magnifier/magnification_controller.cc b/ash/magnifier/magnification_controller.cc
index cb77376..31cd831 100644
--- a/ash/magnifier/magnification_controller.cc
+++ b/ash/magnifier/magnification_controller.cc
@@ -68,7 +68,7 @@ const int kCursorPanningMargin = 100;
const int kCaretPanningMargin = 50;
void MoveCursorTo(aura::WindowTreeHost* host, const gfx::Point& root_location) {
- gfx::Point3F host_location_3f(root_location);
+ auto host_location_3f = gfx::Point3F(gfx::PointF(root_location));
host->GetRootTransform().TransformPoint(&host_location_3f);
host->MoveCursorToHostLocation(
gfx::ToCeiledPoint(host_location_3f.AsPointF()));
@@ -568,7 +568,7 @@ void MagnificationControllerImpl::MoveWindow(int x, int y, bool animate) {
if (!is_enabled_)
return;
- Redraw(gfx::Point(x, y), scale_, animate);
+ Redraw(gfx::PointF(x, y), scale_, animate);
}
void MagnificationControllerImpl::MoveWindow(const gfx::Point& point,
@@ -576,7 +576,7 @@ void MagnificationControllerImpl::MoveWindow(const gfx::Point& point,
if (!is_enabled_)
return;
- Redraw(point, scale_, animate);
+ Redraw(gfx::PointF(point), scale_, animate);
}
void MagnificationControllerImpl::SetScrollDirection(
@@ -724,7 +724,7 @@ void MagnificationControllerImpl::MoveMagnifierWindowFollowPoint(
}
int y = top + y_diff;
if (start_zoom && !is_on_animation_) {
- bool ret = RedrawDIP(gfx::Point(x, y), scale_,
+ bool ret = RedrawDIP(gfx::PointF(x, y), scale_,
0, // No animation on panning.
kDefaultAnimationTweenType);
@@ -746,9 +746,9 @@ void MagnificationControllerImpl::MoveMagnifierWindowCenterPoint(
if (!is_on_animation_) {
// With animation on panning.
- RedrawDIP(window_rect.origin() + (point - window_rect.CenterPoint()),
- scale_, kDefaultAnimationDurationInMs,
- kCenterCaretAnimationTweenType);
+ RedrawDIP(
+ gfx::PointF(window_rect.origin() + (point - window_rect.CenterPoint())),
+ scale_, kDefaultAnimationDurationInMs, kCenterCaretAnimationTweenType);
}
}
@@ -785,7 +785,7 @@ void MagnificationControllerImpl::MoveMagnifierWindowFollowRect(
root_window_->layer()->GetAnimator()->StopAnimating();
is_on_animation_ = false;
}
- RedrawDIP(gfx::Point(x, y), scale_,
+ RedrawDIP(gfx::PointF(x, y), scale_,
0, // No animation on panning.
kDefaultAnimationTweenType);
}