Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2238)

Unified Diff: ui/chromeos/touch_exploration_controller.cc

Issue 1372253002: gfx: Make conversions from gfx::Point to PointF explicit. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: pointfconvert-gfx: . Created 5 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: ui/chromeos/touch_exploration_controller.cc
diff --git a/ui/chromeos/touch_exploration_controller.cc b/ui/chromeos/touch_exploration_controller.cc
index 0e17b546aec7f3505f4d96e13fa83fff60900a42..c5bc4c363e39ff3f2b51da1d0a992bfe4fdb703c 100644
--- a/ui/chromeos/touch_exploration_controller.cc
+++ b/ui/chromeos/touch_exploration_controller.cc
@@ -711,11 +711,9 @@ void TouchExplorationController::OnTapTimerFired() {
SET_STATE(ONE_FINGER_PASSTHROUGH);
passthrough_offset_ = last_unused_finger_event_->location() -
last_touch_exploration_->location();
- scoped_ptr<ui::TouchEvent> passthrough_press(
- new ui::TouchEvent(ui::ET_TOUCH_PRESSED,
- last_touch_exploration_->location(),
- last_unused_finger_event_->touch_id(),
- Now()));
+ scoped_ptr<ui::TouchEvent> passthrough_press(new ui::TouchEvent(
+ ui::ET_TOUCH_PRESSED, last_touch_exploration_->location_f(),
+ last_unused_finger_event_->touch_id(), Now()));
DispatchEvent(passthrough_press.get());
return;
}
@@ -965,7 +963,7 @@ base::Closure TouchExplorationController::BindKeyEventWithFlags(
}
scoped_ptr<ui::Event> TouchExplorationController::CreateMouseMoveEvent(
- const gfx::PointF& location,
+ const gfx::Point& location,
int flags) {
// The "synthesized" flag should be set on all events that don't have a
// backing native event.
@@ -987,7 +985,8 @@ scoped_ptr<ui::Event> TouchExplorationController::CreateMouseMoveEvent(
flags |= ui::EF_COMMAND_DOWN;
return make_scoped_ptr(new ui::MouseEvent(
- ui::ET_MOUSE_MOVED, location, location, ui::EventTimeForNow(), flags, 0));
+ ui::ET_MOUSE_MOVED, gfx::PointF(location), gfx::PointF(location),
+ ui::EventTimeForNow(), flags, 0));
}
void TouchExplorationController::EnterTouchToMouseMode() {

Powered by Google App Engine
This is Rietveld 408576698