Index: third_party/WebKit/Source/core/events/MouseEvent.cpp |
diff --git a/third_party/WebKit/Source/core/events/MouseEvent.cpp b/third_party/WebKit/Source/core/events/MouseEvent.cpp |
index 9da39b5fc792ed26f2d0de0c765b930c365d4d4d..421e8d50d0362b4f19a70b1bf6506d9bc579ecae 100644 |
--- a/third_party/WebKit/Source/core/events/MouseEvent.cpp |
+++ b/third_party/WebKit/Source/core/events/MouseEvent.cpp |
@@ -107,7 +107,7 @@ MouseEvent* MouseEvent::create(const AtomicString& eventType, |
AbstractView* view, |
Event* underlyingEvent, |
SimulatedClickCreationScope creationScope) { |
- PlatformEvent::Modifiers modifiers = PlatformEvent::NoModifiers; |
+ WebInputEvent::Modifiers modifiers = WebInputEvent::NoModifiers; |
if (UIEventWithKeyState* keyStateEvent = |
findEventWithKeyState(underlyingEvent)) { |
modifiers = keyStateEvent->modifiers(); |
@@ -162,7 +162,7 @@ MouseEvent::MouseEvent(const AtomicString& eventType, |
cancelable, |
abstractView, |
detail, |
- static_cast<PlatformEvent::Modifiers>(event.modifiers()), |
+ static_cast<WebInputEvent::Modifiers>(event.modifiers()), |
TimeTicks::FromSeconds(event.timeStampSeconds()), |
abstractView |
? abstractView->getInputDeviceCapabilities()->firesTouchEvents( |
@@ -172,7 +172,7 @@ MouseEvent::MouseEvent(const AtomicString& eventType, |
m_movementDelta(flooredIntPoint(event.movementInRootFrame())), |
m_positionType(PositionType::Position), |
m_button(static_cast<short>(event.button)), |
- m_buttons(platformModifiersToButtons(event.modifiers())), |
+ m_buttons(webInputEventModifiersToButtons(event.modifiers())), |
m_relatedTarget(relatedTarget), |
m_syntheticEventType(event.fromTouch() ? FromTouch |
: RealOrIndistinguishable), |
@@ -193,7 +193,7 @@ MouseEvent::MouseEvent(const AtomicString& eventType, |
int windowY, |
int movementX, |
int movementY, |
- PlatformEvent::Modifiers modifiers, |
+ WebInputEvent::Modifiers modifiers, |
short button, |
unsigned short buttons, |
EventTarget* relatedTarget, |
@@ -288,15 +288,15 @@ void MouseEvent::initCoordinatesFromRootFrame(int windowX, int windowY) { |
MouseEvent::~MouseEvent() {} |
-unsigned short MouseEvent::platformModifiersToButtons(unsigned modifiers) { |
+unsigned short MouseEvent::webInputEventModifiersToButtons(unsigned modifiers) { |
unsigned short buttons = 0; |
- if (modifiers & PlatformEvent::LeftButtonDown) |
+ if (modifiers & WebInputEvent::LeftButtonDown) |
buttons |= static_cast<unsigned short>(WebPointerProperties::Buttons::Left); |
- if (modifiers & PlatformEvent::RightButtonDown) |
+ if (modifiers & WebInputEvent::RightButtonDown) |
buttons |= |
static_cast<unsigned short>(WebPointerProperties::Buttons::Right); |
- if (modifiers & PlatformEvent::MiddleButtonDown) |
+ if (modifiers & WebInputEvent::MiddleButtonDown) |
buttons |= |
static_cast<unsigned short>(WebPointerProperties::Buttons::Middle); |
@@ -343,7 +343,7 @@ void MouseEvent::initMouseEventInternal( |
int screenY, |
int clientX, |
int clientY, |
- PlatformEvent::Modifiers modifiers, |
+ WebInputEvent::Modifiers modifiers, |
short button, |
EventTarget* relatedTarget, |
InputDeviceCapabilities* sourceCapabilities, |