Skip to content

Commit

Permalink
ozone: evdev: Set modifier flags on touch events
Browse files Browse the repository at this point in the history
This fixes a regression vs X11 where all touch events are missing
modifier flags.

BUG=450650
TEST=Open http://www.rbyers.net/eventTest.html on link, hold shift, and
     tap the touchscreen. Page shows "shift" on the click event line.

Review URL: https://codereview.chromium.org/887743002

Cr-Commit-Position: refs/heads/master@{#313788}
  • Loading branch information
mspang authored and Commit bot committed Jan 29, 2015
1 parent d9f6557 commit ec64091
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions ui/events/ozone/evdev/event_factory_evdev.cc
Original file line number Diff line number Diff line change
Expand Up @@ -157,8 +157,8 @@ void EventFactoryEvdev::DispatchTouchEvent(const TouchEventParams& params) {
&radius_y);

scoped_ptr<TouchEvent> touch_event(new TouchEvent(
params.type, gfx::PointF(x, y),
/* flags */ 0, params.touch_id, params.timestamp, radius_x, radius_y,
params.type, gfx::PointF(x, y), modifiers_.GetModifierFlags(),
params.touch_id, params.timestamp, radius_x, radius_y,
/* angle */ 0., params.pressure));
touch_event->set_source_device_id(params.device_id);
PostUiEvent(touch_event.Pass());
Expand Down

0 comments on commit ec64091

Please sign in to comment.