Cleaning up PointerIdManager and add id re-mapping

third_party/WebKit/Source/core/events/PointerEvent.cpp

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "config.h"
 #include "core/events/PointerEvent.h"
 
 #include "core/dom/Element.h"
 #include "core/events/EventDispatcher.h"
 
@@ skipping 15 matching lines @@
     }
     ASSERT_NOT_REACHED();
     return "";
 }
 
 }
 
 PassRefPtrWillBeRawPtr<PointerEvent> PointerEvent::create(const AtomicString& type,
     const bool isPrimary, const PlatformMouseEvent& mouseEvent,
     PassRefPtrWillBeRawPtr<Node> relatedTarget,
-    PassRefPtrWillBeRawPtr<AbstractView> view)
+    PassRefPtrWillBeRawPtr<AbstractView> view, const unsigned pointerId)
 {
     PointerEventInit pointerEventInit;
 
-    // TODO(crbug.com/537319): Define a constant somewhere for mouse id.
-    pointerEventInit.setPointerId(0);
-
+    pointerEventInit.setPointerId(pointerId);
     pointerEventInit.setPointerType(pointerTypeNameForWebPointPointerType(WebPointerProperties::PointerType::Mouse));
-    pointerEventInit.setIsPrimary(true);
+    pointerEventInit.setIsPrimary(isPrimary);
 
     pointerEventInit.setScreenX(mouseEvent.globalPosition().x());
     pointerEventInit.setScreenY(mouseEvent.globalPosition().y());
     pointerEventInit.setClientX(mouseEvent.position().x());
     pointerEventInit.setClientY(mouseEvent.position().y());
 
     pointerEventInit.setButton(mouseEvent.button());
     pointerEventInit.setButtons(MouseEvent::platformModifiersToButtons(mouseEvent.modifiers()));
 
     UIEventWithKeyState::setFromPlatformModifiers(pointerEventInit, mouseEvent.modifiers());
 
     pointerEventInit.setBubbles(type != EventTypeNames::pointerenter
         && type != EventTypeNames::pointerleave);
     pointerEventInit.setCancelable(type != EventTypeNames::pointerenter
         && type != EventTypeNames::pointerleave && type != EventTypeNames::pointercancel);
 
     pointerEventInit.setView(view);
     if (relatedTarget)
         pointerEventInit.setRelatedTarget(relatedTarget);
 
     return PointerEvent::create(type, pointerEventInit);
 }
 
 PassRefPtrWillBeRawPtr<PointerEvent> PointerEvent::create(const AtomicString& type,
     const bool isPrimary, const PlatformTouchPoint& touchPoint,
     PlatformEvent::Modifiers modifiers,
     const double width, const double height,
-    const double clientX, const double clientY)
+    const double clientX, const double clientY,
+    const unsigned pointerId)
 {
-    const unsigned& pointerId = touchPoint.id();
     const PlatformTouchPoint::State pointState = touchPoint.state();
 
     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;
@@ skipping 105 matching lines @@
     ASSERT(!event().target() || event().target() != event().relatedTarget());
 
     EventTarget* relatedTarget = event().relatedTarget();
     event().eventPath().adjustForRelatedTarget(dispatcher.node(), relatedTarget);
 
     dispatcher.dispatch();
     return !event().defaultHandled() && !event().defaultPrevented();
 }
 
 } // namespace blink