Cleaning up PointerIdManager and add id re-mapping

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

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..964634055a4b54665d1585517ed889ac382d983e 100644
--- a/third_party/WebKit/Source/core/events/PointerEvent.cpp
+++ b/third_party/WebKit/Source/core/events/PointerEvent.cpp
@@ -33,15 +33,13 @@ const char* pointerTypeNameForWebPointPointerType(WebPointerProperties::PointerT
 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());
@@ -69,9 +67,9 @@ PassRefPtrWillBeRawPtr<PointerEvent> PointerEvent::create(const AtomicString& ty
     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