| Index: third_party/WebKit/Source/core/events/PointerEvent.cpp
|
| diff --git a/third_party/WebKit/Source/core/events/PointerEvent.cpp b/third_party/WebKit/Source/core/events/PointerEvent.cpp
|
| index 5f2111722a9c7ab0cbfda014e2ed7c10b5ec68f6..d8fa92257a78a0e8734fa25ff6b53d518a073452 100644
|
| --- a/third_party/WebKit/Source/core/events/PointerEvent.cpp
|
| +++ b/third_party/WebKit/Source/core/events/PointerEvent.cpp
|
| @@ -39,8 +39,8 @@ PassRefPtrWillBeRawPtr<PointerEvent> PointerEvent::create(const AtomicString& ty
|
|
|
| // TODO(crbug.com/537319): Define a constant somewhere for mouse id.
|
| pointerEventInit.setPointerId(0);
|
| -
|
| - pointerEventInit.setPointerType(pointerTypeNameForWebPointPointerType(WebPointerProperties::PointerType::Mouse));
|
| + pointerEventInit.setPointerType(
|
| + pointerTypeNameForWebPointPointerType(mouseEvent.pointerProperties().pointerType));
|
| pointerEventInit.setIsPrimary(true);
|
|
|
| pointerEventInit.setScreenX(mouseEvent.globalPosition().x());
|
| @@ -51,6 +51,10 @@ PassRefPtrWillBeRawPtr<PointerEvent> PointerEvent::create(const AtomicString& ty
|
| pointerEventInit.setButton(mouseEvent.button());
|
| pointerEventInit.setButtons(MouseEvent::platformModifiersToButtons(mouseEvent.modifiers()));
|
|
|
| + pointerEventInit.setPressure(mouseEvent.pointerProperties().force);
|
| + pointerEventInit.setTiltX(mouseEvent.pointerProperties().tiltX);
|
| + pointerEventInit.setTiltY(mouseEvent.pointerProperties().tiltY);
|
| +
|
| UIEventWithKeyState::setFromPlatformModifiers(pointerEventInit, mouseEvent.modifiers());
|
|
|
| pointerEventInit.setBubbles(type != EventTypeNames::pointerenter
|
| @@ -76,20 +80,20 @@ PassRefPtrWillBeRawPtr<PointerEvent> PointerEvent::create(const AtomicString& ty
|
|
|
| bool pointerReleasedOrCancelled = pointState == PlatformTouchPoint::TouchReleased
|
| || pointState == PlatformTouchPoint::TouchCancelled;
|
| - const WebPointerProperties::PointerType pointerType = touchPoint.pointerProperties().pointerType;
|
| - const String& pointerTypeStr = pointerTypeNameForWebPointPointerType(pointerType);
|
|
|
| bool isEnterOrLeave = false;
|
|
|
| PointerEventInit pointerEventInit;
|
| pointerEventInit.setPointerId(pointerId);
|
| + pointerEventInit.setPointerType(
|
| + pointerTypeNameForWebPointPointerType(touchPoint.pointerProperties().pointerType));
|
| + pointerEventInit.setIsPrimary(isPrimary);
|
| +
|
| pointerEventInit.setWidth(width);
|
| pointerEventInit.setHeight(height);
|
| pointerEventInit.setPressure(touchPoint.force());
|
| pointerEventInit.setTiltX(touchPoint.pointerProperties().tiltX);
|
| pointerEventInit.setTiltY(touchPoint.pointerProperties().tiltY);
|
| - pointerEventInit.setPointerType(pointerTypeStr);
|
| - pointerEventInit.setIsPrimary(isPrimary);
|
| pointerEventInit.setScreenX(touchPoint.screenPos().x());
|
| pointerEventInit.setScreenY(touchPoint.screenPos().y());
|
| pointerEventInit.setClientX(clientX);
|
|
|