summaryrefslogtreecommitdiffstats
path: root/ash/touch
diff options
context:
space:
mode:
authordanakj@chromium.org <danakj@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-11-09 21:44:13 +0000
committerdanakj@chromium.org <danakj@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-11-09 21:44:13 +0000
commitfaf56350461211be7de324e5514e8c8119b2047f (patch)
treecf32ca3885dba45c4be7b7415c24a534cd1f7948 /ash/touch
parentb9f4fe57863be1acc88ebe779f9f91bce0e1aeff (diff)
downloadchromium_src-faf56350461211be7de324e5514e8c8119b2047f.zip
chromium_src-faf56350461211be7de324e5514e8c8119b2047f.tar.gz
chromium_src-faf56350461211be7de324e5514e8c8119b2047f.tar.bz2
ui: Make gfx::Point::Scale() mutate the class, similar to gfx::Rect.
We add gfx::ScalePoint() as a non-mutating version of the Scale method. Tests: ui_unittests:PointTest.Scale R=sky BUG=160158 Review URL: https://codereview.chromium.org/11369144 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@166979 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/touch')
-rw-r--r--ash/touch/touch_uma.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/ash/touch/touch_uma.cc b/ash/touch/touch_uma.cc
index a9ca319..d8117b6 100644
--- a/ash/touch/touch_uma.cc
+++ b/ash/touch/touch_uma.cc
@@ -318,7 +318,7 @@ void TouchUMA::RecordTouchEvent(aura::Window* target,
position = ui::EventLocationFromNative(event.native_event());
#endif
position = gfx::ToFlooredPoint(
- position.Scale(1. / target->layer()->device_scale_factor()));
+ gfx::ScalePoint(position, 1. / target->layer()->device_scale_factor()));
}
position.set_x(std::min(bounds.width() - 1, std::max(0, position.x())));