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

Unified Diff: ui/events/ozone/evdev/input_injector_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
Index: ui/events/ozone/evdev/input_injector_evdev.cc
diff --git a/ui/events/ozone/evdev/input_injector_evdev.cc b/ui/events/ozone/evdev/input_injector_evdev.cc
index bf98bb4cb810b79e6e04127bff25efec075d1d0f..7b20f75e5ccb6e86e4d7b8525bdc1ca03cb90cac 100644
--- a/ui/events/ozone/evdev/input_injector_evdev.cc
+++ b/ui/events/ozone/evdev/input_injector_evdev.cc
@@ -48,8 +48,8 @@ void InputInjectorEvdev::InjectMouseButton(EventFlags button, bool down) {
EventModifiersEvdev::GetEventFlagFromModifier(changed_button);
callback_.Run(make_scoped_ptr(new MouseEvent(
(down) ? ET_MOUSE_PRESSED : ET_MOUSE_RELEASED,
- cursor_->location(),
- cursor_->location(),
+ cursor_->GetLocation(),
+ cursor_->GetLocation(),
modifiers_->GetModifierFlags() | changed_button_flag,
changed_button_flag)));
}
@@ -57,8 +57,8 @@ void InputInjectorEvdev::InjectMouseButton(EventFlags button, bool down) {
void InputInjectorEvdev::InjectMouseWheel(int delta_x, int delta_y) {
callback_.Run(make_scoped_ptr(new MouseWheelEvent(
gfx::Vector2d(delta_x, delta_y),
- cursor_->location(),
- cursor_->location(),
+ cursor_->GetLocation(),
+ cursor_->GetLocation(),
modifiers_->GetModifierFlags(),
0 /* changed_button_flags */)));
}
@@ -68,8 +68,8 @@ void InputInjectorEvdev::MoveCursorTo(const gfx::PointF& location) {
cursor_->MoveCursorTo(location);
callback_.Run(make_scoped_ptr(new MouseEvent(
ET_MOUSE_MOVED,
- cursor_->location(),
- cursor_->location(),
+ cursor_->GetLocation(),
+ cursor_->GetLocation(),
modifiers_->GetModifierFlags(),
0 /* changed_button_flags */)));
}
« no previous file with comments | « ui/events/ozone/evdev/event_factory_evdev.cc ('k') | ui/events/ozone/evdev/input_injector_evdev_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698