| Index: third_party/WebKit/Source/core/events/PointerEventFactory.cpp
|
| diff --git a/third_party/WebKit/Source/core/events/PointerEventFactory.cpp b/third_party/WebKit/Source/core/events/PointerEventFactory.cpp
|
| index 5c51a0714d510fc6ccefa7a52828e7b9a7f8eec3..3c7ef36f4a75d2f1884e87c3a45fcf1e28d8c824 100644
|
| --- a/third_party/WebKit/Source/core/events/PointerEventFactory.cpp
|
| +++ b/third_party/WebKit/Source/core/events/PointerEventFactory.cpp
|
| @@ -90,6 +90,7 @@ PassRefPtrWillBeRawPtr<PointerEvent> PointerEventFactory::create(
|
| pointerEventInit.setScreenY(mouseEvent.globalPosition().y());
|
| pointerEventInit.setClientX(mouseEvent.position().x());
|
| pointerEventInit.setClientY(mouseEvent.position().y());
|
| +
|
| if (pointerEventName == EventTypeNames::pointerdown
|
| || pointerEventName == EventTypeNames::pointerup) {
|
| pointerEventInit.setButton(mouseEvent.button());
|
| @@ -266,13 +267,13 @@ int PointerEventFactory::addIdAndActiveButtons(const IncomingId p,
|
| return mappedId;
|
| }
|
|
|
| -void PointerEventFactory::remove(
|
| +bool PointerEventFactory::remove(
|
| const PassRefPtrWillBeRawPtr<PointerEvent> pointerEvent)
|
| {
|
| int mappedId = pointerEvent->pointerId();
|
| // Do not remove mouse pointer id as it should always be there
|
| if (mappedId == s_mouseId || !m_pointerIdMapping.contains(mappedId))
|
| - return;
|
| + return false;
|
|
|
| IncomingId p = m_pointerIdMapping.get(mappedId).incomingId;
|
| int type = p.pointerType();
|
| @@ -281,6 +282,7 @@ void PointerEventFactory::remove(
|
| if (m_primaryId[type] == mappedId)
|
| m_primaryId[type] = PointerEventFactory::s_invalidId;
|
| m_idCount[type]--;
|
| + return true;
|
| }
|
|
|
| bool PointerEventFactory::isPrimary(int mappedId) const
|
|
|