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

Unified Diff: ui/events/blink/web_input_event.cc

Issue 2252423002: Refactoring button field and its type (2nd try) (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebasing Created 4 years, 4 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
Index: ui/events/blink/web_input_event.cc
diff --git a/ui/events/blink/web_input_event.cc b/ui/events/blink/web_input_event.cc
index 3eacef0fc0b9c09ceabccd3431e534a02eb0e880..a17d9f406087619965d8ceb2a3076cf9638246ea 100644
--- a/ui/events/blink/web_input_event.cc
+++ b/ui/events/blink/web_input_event.cc
@@ -142,7 +142,7 @@ blink::WebMouseWheelEvent MakeWebMouseWheelEventFromUiEvent(
blink::WebMouseWheelEvent webkit_event;
webkit_event.type = blink::WebInputEvent::MouseWheel;
- webkit_event.button = blink::WebMouseEvent::ButtonNone;
+ webkit_event.button = blink::WebMouseEvent::Button::NoButton;
webkit_event.modifiers = EventFlagsToWebEventModifiers(event.flags());
webkit_event.timeStampSeconds = EventTimeStampToSeconds(event.time_stamp());
webkit_event.hasPreciseScrollingDeltas = true;
@@ -411,7 +411,7 @@ blink::WebMouseEvent MakeWebMouseEventFromUiEvent(const MouseEvent& event) {
webkit_event.modifiers = EventFlagsToWebEventModifiers(event.flags());
webkit_event.timeStampSeconds = EventTimeStampToSeconds(event.time_stamp());
- webkit_event.button = blink::WebMouseEvent::ButtonNone;
+ webkit_event.button = blink::WebMouseEvent::Button::NoButton;
int button_flags = event.flags();
if (event.type() == ET_MOUSE_PRESSED || event.type() == ET_MOUSE_RELEASED) {
// We want to use changed_button_flags() for mouse pressed & released.
@@ -421,11 +421,11 @@ blink::WebMouseEvent MakeWebMouseEventFromUiEvent(const MouseEvent& event) {
button_flags = event.changed_button_flags();
}
if (button_flags & EF_LEFT_MOUSE_BUTTON)
- webkit_event.button = blink::WebMouseEvent::ButtonLeft;
+ webkit_event.button = blink::WebMouseEvent::Button::Left;
if (button_flags & EF_MIDDLE_MOUSE_BUTTON)
- webkit_event.button = blink::WebMouseEvent::ButtonMiddle;
+ webkit_event.button = blink::WebMouseEvent::Button::Middle;
if (button_flags & EF_RIGHT_MOUSE_BUTTON)
- webkit_event.button = blink::WebMouseEvent::ButtonRight;
+ webkit_event.button = blink::WebMouseEvent::Button::Right;
switch (event.type()) {
case ET_MOUSE_PRESSED:
@@ -461,7 +461,7 @@ blink::WebMouseWheelEvent MakeWebMouseWheelEventFromUiEvent(
blink::WebMouseWheelEvent webkit_event;
webkit_event.type = blink::WebInputEvent::MouseWheel;
- webkit_event.button = blink::WebMouseEvent::ButtonNone;
+ webkit_event.button = blink::WebMouseEvent::Button::NoButton;
webkit_event.modifiers = EventFlagsToWebEventModifiers(event.flags());
webkit_event.timeStampSeconds = EventTimeStampToSeconds(event.time_stamp());
« no previous file with comments | « third_party/WebKit/public/platform/WebScrollbarBehavior.h ('k') | ui/events/blink/web_input_event_builders_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698