Use touch events to report stylus events

third_party/WebKit/Source/core/input/TouchEventManager.cpp

 // Copyright 2016 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 "core/input/TouchEventManager.h"
 
 #include "core/dom/Document.h"
 #include "core/events/TouchEvent.h"
 #include "core/frame/Deprecation.h"
 #include "core/frame/EventHandlerRegistry.h"
@@ skipping 110 matching lines @@
   TargetTouchesHeapMap touchesByTarget;
 
   // Array of touches per state, used to assemble the |changedTouches| list.
   ChangedTouches changedTouches[PlatformTouchPoint::TouchStateEnd];
 
   for (auto touchInfo : touchInfos) {
     const PlatformTouchPoint& point = touchInfo.point;
     PlatformTouchPoint::TouchState pointState = point.state();
 
     Touch* touch = Touch::create(
-        touchInfo.targetFrame.get(), touchInfo.touchNode.get(), point.id(),
+        touchInfo.targetFrame.get(), touchInfo.touchNode.get(),
         point.screenPos(), touchInfo.contentPoint, touchInfo.adjustedRadius,
-        point.rotationAngle(), point.force(), touchInfo.region);
+        point.rotationAngle(), touchInfo.region, point.pointerProperties());
 
     // Ensure this target's touch list exists, even if it ends up empty, so
     // it can always be passed to TouchEvent::Create below.
     TargetTouchesHeapMap::iterator targetTouchesIterator =
         touchesByTarget.find(touchInfo.touchNode.get());
     if (targetTouchesIterator == touchesByTarget.end()) {
       touchesByTarget.set(touchInfo.touchNode.get(), TouchList::create());
       targetTouchesIterator = touchesByTarget.find(touchInfo.touchNode.get());
     }
 
@@ skipping 355 matching lines @@
   }
 
   return dispatchTouchEvents(event, touchInfos, allTouchesReleased);
 }
 
 bool TouchEventManager::isAnyTouchActive() const {
   return m_touchPressed;
 }
 
 }  // namespace blink