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

Unified Diff: components/mus/gesture_manager.cc

Issue 1344223002: Revert of Overhaul Mandoline event transport code (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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
« no previous file with comments | « components/mus/event_dispatcher.cc ('k') | components/mus/gesture_manager_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/mus/gesture_manager.cc
diff --git a/components/mus/gesture_manager.cc b/components/mus/gesture_manager.cc
index f83cefb30a94ae9ac11d5048344dfe74f139d416..77a678c6d28bf87a79b119920a4c0376527769f0 100644
--- a/components/mus/gesture_manager.cc
+++ b/components/mus/gesture_manager.cc
@@ -55,12 +55,11 @@
mojo::EventPtr CloneEventForView(const mojo::Event& event,
const ServerView* view) {
mojo::EventPtr result(event.Clone());
- const gfx::PointF location(event.pointer_data->location->x,
- event.pointer_data->location->y);
+ const gfx::PointF location(event.pointer_data->x, event.pointer_data->y);
const gfx::PointF target_location(
ConvertPointFBetweenViews(view->GetRoot(), view, location));
- result->pointer_data->location->x = target_location.x();
- result->pointer_data->location->y = target_location.y();
+ result->pointer_data->x = target_location.x();
+ result->pointer_data->y = target_location.y();
return result.Pass();
}
@@ -539,8 +538,8 @@
return false;
ScheduledDeleteProcessor delete_processor(this);
- const gfx::Point location(static_cast<int>(event.pointer_data->location->x),
- static_cast<int>(event.pointer_data->location->y));
+ const gfx::Point location(static_cast<int>(event.pointer_data->x),
+ static_cast<int>(event.pointer_data->y));
switch (event.action) {
case mojo::EVENT_TYPE_POINTER_DOWN: {
if (GetPointerById(event.pointer_data->pointer_id)) {
« no previous file with comments | « components/mus/event_dispatcher.cc ('k') | components/mus/gesture_manager_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698