Set the correct pressure for pointer events based on force

third_party/WebKit/Source/core/events/PointerEventManager.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 "core/events/PointerEventManager.h"
 
 namespace blink {
 
 namespace {
 
@@ skipping 47 matching lines @@
 
     setIdAndType(pointerEventInit, mouseEvent.pointerProperties());
 
     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()));
+    pointerEventInit.setPressure(isnan(mouseEvent.pointerProperties().force)
+        ? (pointerEventInit.buttons() ? 0.5 : 0)
+        : mouseEvent.pointerProperties().force);
 
     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)
@@ skipping 13 matching lines @@
         || pointState == PlatformTouchPoint::TouchCancelled;
 
     bool isEnterOrLeave = false;
 
     PointerEventInit pointerEventInit;
 
     setIdAndType(pointerEventInit, touchPoint.pointerProperties());
 
     pointerEventInit.setWidth(width);
     pointerEventInit.setHeight(height);
-    pointerEventInit.setPressure(touchPoint.force());
     pointerEventInit.setTiltX(touchPoint.pointerProperties().tiltX);
     pointerEventInit.setTiltY(touchPoint.pointerProperties().tiltY);
     pointerEventInit.setScreenX(touchPoint.screenPos().x());
     pointerEventInit.setScreenY(touchPoint.screenPos().y());
     pointerEventInit.setClientX(clientX);
     pointerEventInit.setClientY(clientY);
     pointerEventInit.setButton(0);
     pointerEventInit.setButtons(pointerReleasedOrCancelled ? 0 : 1);
+    pointerEventInit.setPressure(isnan(touchPoint.force())

[mustaq, 2016/01/25 16:34:29]

Please create a helper function to avoid repeats.

[Navid Zolghadr, 2016/01/25 20:26:50]

Done.

+        ? (pointerEventInit.buttons() ? 0.5 : 0)
+        : touchPoint.force());
 
     UIEventWithKeyState::setFromPlatformModifiers(pointerEventInit, modifiers);
 
     pointerEventInit.setBubbles(!isEnterOrLeave);
     pointerEventInit.setCancelable(!isEnterOrLeave && pointState != PlatformTouchPoint::TouchCancelled);
 
     return PointerEvent::create(type, pointerEventInit);
 }
 
 
@@ skipping 76 matching lines @@
     if (!m_idReverseMapping.contains(mappedId))
         return false;
 
     IncomingId p = m_idReverseMapping.get(mappedId);
     int type = p.first;
     return m_primaryId[type] == mappedId;
 }
 
 
 } // namespace blink