ui/events/ozone/evdev/tablet_event_converter_evdev.cc - Issue 761843003: ozone: dri: Rename DriCursor::location() to GetLocation()

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: ui/events/ozone/evdev/tablet_event_converter_evdev.cc

Issue 761843003: ozone: dri: Rename DriCursor::location() to GetLocation() (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: test Created 6 years, 1 month 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 | « ui/events/ozone/evdev/libgestures_glue/gesture_interpreter_libevdev_cros.cc ('k') | ui/events/ozone/evdev/tablet_event_converter_evdev_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 40bac2c017f213b45ee73e3d31d003c4308f1091..e88148d19dd29ff80b66a57838ca54d4bb1e4441 100644

--- a/ui/events/ozone/evdev/tablet_event_converter_evdev.cc

+++ b/ui/events/ozone/evdev/tablet_event_converter_evdev.cc

@@ -141,9 +141,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_->GetLocation(),

+ modifiers_->GetModifierFlags() | flag, flag)));

}

void TabletEventConverterEvdev::FlushEvents() {

@@ -162,8 +163,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_->GetLocation(), modifiers_->GetModifierFlags(),

/* changed_button_flags */ 0)));

abs_value_dirty_ = false;