content/browser/renderer_host/web_input_event_aura.cc - Issue 2227563003: Refactoring button field and its type

Unified Diff: content/browser/renderer_host/web_input_event_aura.cc

Issue 2227563003: Refactoring button field and its type (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Fix mac/win errors 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

« no previous file with comments | « content/browser/renderer_host/render_widget_host_view_mac.mm ('k') | content/browser/renderer_host/web_input_event_aura_unittest.cc » ('j') | third_party/WebKit/Source/core/events/PointerEventFactory.cpp » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/renderer_host/web_input_event_aura.cc

diff --git a/content/browser/renderer_host/web_input_event_aura.cc b/content/browser/renderer_host/web_input_event_aura.cc

index e0fa0a558468bffa400f23985c28521eb17112c7..25a1387f9aa5a9b8acf4484f27baeed0e8f8a62f 100644

--- a/content/browser/renderer_host/web_input_event_aura.cc

+++ b/content/browser/renderer_host/web_input_event_aura.cc

@@ -124,7 +124,7 @@ blink::WebMouseWheelEvent MakeWebMouseWheelEventFromAuraEvent(

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 = ui::EventFlagsToWebEventModifiers(event.flags());

webkit_event.timeStampSeconds =

ui::EventTimeStampToSeconds(event.time_stamp());

@@ -378,7 +378,7 @@ blink::WebMouseEvent MakeWebMouseEventFromAuraEvent(

webkit_event.modifiers = ui::EventFlagsToWebEventModifiers(event.flags());

webkit_event.timeStampSeconds =

ui::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() == ui::ET_MOUSE_PRESSED ||

event.type() == ui::ET_MOUSE_RELEASED) {

@@ -389,11 +389,11 @@ blink::WebMouseEvent MakeWebMouseEventFromAuraEvent(

button_flags = event.changed_button_flags();

}

if (button_flags & ui::EF_LEFT_MOUSE_BUTTON)

- webkit_event.button = blink::WebMouseEvent::ButtonLeft;

+ webkit_event.button = blink::WebMouseEvent::Button::Left;

if (button_flags & ui::EF_MIDDLE_MOUSE_BUTTON)

- webkit_event.button = blink::WebMouseEvent::ButtonMiddle;

+ webkit_event.button = blink::WebMouseEvent::Button::Middle;

if (button_flags & ui::EF_RIGHT_MOUSE_BUTTON)

- webkit_event.button = blink::WebMouseEvent::ButtonRight;

+ webkit_event.button = blink::WebMouseEvent::Button::Right;

switch (event.type()) {

case ui::ET_MOUSE_PRESSED:

@@ -429,7 +429,7 @@ blink::WebMouseWheelEvent MakeWebMouseWheelEventFromAuraEvent(

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 = ui::EventFlagsToWebEventModifiers(event.flags());

webkit_event.timeStampSeconds =

ui::EventTimeStampToSeconds(event.time_stamp());