| 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..4b30e80042ab8887e1e2d9fafd9a9f6df0236e5b 100644
|
| --- a/third_party/WebKit/Source/core/events/MouseEvent.cpp
|
| +++ b/third_party/WebKit/Source/core/events/MouseEvent.cpp
|
| @@ -164,10 +164,7 @@ MouseEvent::MouseEvent(const AtomicString& eventType,
|
| detail,
|
| static_cast<PlatformEvent::Modifiers>(event.modifiers()),
|
| TimeTicks::FromSeconds(event.timeStampSeconds()),
|
| - abstractView
|
| - ? abstractView->getInputDeviceCapabilities()->firesTouchEvents(
|
| - event.fromTouch())
|
| - : nullptr),
|
| + InputDeviceCapabilitiesValue(event.fromTouch())),
|
| m_screenLocation(event.globalX, event.globalY),
|
| m_movementDelta(flooredIntPoint(event.movementInRootFrame())),
|
| m_positionType(PositionType::Position),
|
| @@ -208,10 +205,7 @@ MouseEvent::MouseEvent(const AtomicString& eventType,
|
| detail,
|
| modifiers,
|
| platformTimeStamp,
|
| - abstractView
|
| - ? abstractView->getInputDeviceCapabilities()->firesTouchEvents(
|
| - syntheticEventType == FromTouch)
|
| - : nullptr),
|
| + InputDeviceCapabilitiesValue(syntheticEventType == FromTouch)),
|
| m_screenLocation(screenX, screenY),
|
| m_movementDelta(movementX, movementY),
|
| m_positionType(syntheticEventType == Positionless
|
| @@ -330,7 +324,7 @@ void MouseEvent::initMouseEvent(ScriptState* scriptState,
|
| initModifiers(ctrlKey, altKey, shiftKey, metaKey);
|
| initMouseEventInternal(type, canBubble, cancelable, view, detail, screenX,
|
| screenY, clientX, clientY, modifiers(), button,
|
| - relatedTarget, nullptr, buttons);
|
| + relatedTarget, InputDeviceCapabilities::Null, buttons);
|
| }
|
|
|
| void MouseEvent::initMouseEventInternal(
|
| @@ -346,7 +340,7 @@ void MouseEvent::initMouseEventInternal(
|
| PlatformEvent::Modifiers modifiers,
|
| short button,
|
| EventTarget* relatedTarget,
|
| - InputDeviceCapabilities* sourceCapabilities,
|
| + const InputDeviceCapabilitiesValue& sourceCapabilities,
|
| unsigned short buttons) {
|
| initUIEventInternal(type, canBubble, cancelable, relatedTarget, view, detail,
|
| sourceCapabilities);
|
| @@ -455,7 +449,7 @@ DispatchEventResult MouseEventDispatchMediator::dispatchEvent(
|
| mouseEvent.view(), mouseEvent.detail(), mouseEvent.screenX(),
|
| mouseEvent.screenY(), mouseEvent.clientX(), mouseEvent.clientY(),
|
| mouseEvent.modifiers(), mouseEvent.button(), relatedTarget,
|
| - mouseEvent.sourceCapabilities(), mouseEvent.buttons());
|
| + mouseEvent.sourceCapabilitiesValue(), mouseEvent.buttons());
|
| doubleClickEvent->setComposed(mouseEvent.composed());
|
|
|
| // Inherit the trusted status from the original event.
|
|
|