| Index: ui/events/ozone/evdev/tablet_event_converter_evdev.cc
|
| diff --git a/ui/events/ozone/evdev/tablet_event_converter_evdev.cc b/ui/events/ozone/evdev/tablet_event_converter_evdev.cc
|
| index d2ca2e3af95d6b0b4c6744b164992357ee784f6d..093bad9e81ca379afb2211485156e1b6cef28007 100644
|
| --- a/ui/events/ozone/evdev/tablet_event_converter_evdev.cc
|
| +++ b/ui/events/ozone/evdev/tablet_event_converter_evdev.cc
|
| @@ -136,9 +136,10 @@ void TabletEventConverterEvdev::DispatchMouseButton(const input_event& input) {
|
|
|
| int flag = modifiers_->GetEventFlagFromModifier(modifier);
|
| modifiers_->UpdateModifier(modifier, input.value);
|
| - callback_.Run(make_scoped_ptr(new MouseEvent(
|
| - input.value ? ET_MOUSE_PRESSED : ET_MOUSE_RELEASED, cursor_->location(),
|
| - cursor_->location(), modifiers_->GetModifierFlags() | flag, flag)));
|
| + callback_.Run(make_scoped_ptr(
|
| + new MouseEvent(input.value ? ET_MOUSE_PRESSED : ET_MOUSE_RELEASED,
|
| + cursor_->GetLocation(), cursor_->GetRootLocation(),
|
| + modifiers_->GetModifierFlags() | flag, flag)));
|
| }
|
|
|
| void TabletEventConverterEvdev::FlushEvents() {
|
| @@ -157,8 +158,8 @@ void TabletEventConverterEvdev::FlushEvents() {
|
| UpdateCursor();
|
|
|
| callback_.Run(make_scoped_ptr(
|
| - new MouseEvent(ui::ET_MOUSE_MOVED, cursor_->location(),
|
| - cursor_->location(), modifiers_->GetModifierFlags(),
|
| + new MouseEvent(ui::ET_MOUSE_MOVED, cursor_->GetLocation(),
|
| + cursor_->GetRootLocation(), modifiers_->GetModifierFlags(),
|
| /* changed_button_flags */ 0)));
|
|
|
| abs_value_dirty_ = false;
|
|
|