From 09f456b2808224e7707e51bfab8957ef067154e4 Mon Sep 17 00:00:00 2001
From: janekptacijarabaci <janekptacijarabaci@seznam.cz>
Date: Fri, 20 Apr 2018 22:18:52 +0200
Subject: moebius#71: DOM - Pointer Events - improvements

https://github.com/MoonchildProductions/moebius/pull/71
---
 widget/MouseEvents.h   |  9 ++++++---
 widget/nsGUIEventIPC.h | 10 +++++++---
 2 files changed, 13 insertions(+), 6 deletions(-)

(limited to 'widget')

diff --git a/widget/MouseEvents.h b/widget/MouseEvents.h
index f214ec22b..442ac41e8 100644
--- a/widget/MouseEvents.h
+++ b/widget/MouseEvents.h
@@ -46,15 +46,17 @@ public:
   uint32_t pointerId;
   uint32_t tiltX;
   uint32_t tiltY;
+  uint32_t twist;
+  float tangentialPressure;
   bool convertToPointer;
-  bool retargetedByPointerCapture;
 
   WidgetPointerHelper()
     : pointerId(0)
     , tiltX(0)
     , tiltY(0)
+    , twist(0)
+    , tangentialPressure(0)
     , convertToPointer(true)
-    , retargetedByPointerCapture(false)
   {
   }
 
@@ -63,8 +65,9 @@ public:
     pointerId = aEvent.pointerId;
     tiltX = aEvent.tiltX;
     tiltY = aEvent.tiltY;
+    twist = aEvent.twist;
+    tangentialPressure = aEvent.tangentialPressure;
     convertToPointer = aEvent.convertToPointer;
-    retargetedByPointerCapture = aEvent.retargetedByPointerCapture;
   }
 };
 
diff --git a/widget/nsGUIEventIPC.h b/widget/nsGUIEventIPC.h
index e06e3784a..e45189bb1 100644
--- a/widget/nsGUIEventIPC.h
+++ b/widget/nsGUIEventIPC.h
@@ -228,8 +228,10 @@ struct ParamTraits<mozilla::WidgetPointerHelper>
     WriteParam(aMsg, aParam.pointerId);
     WriteParam(aMsg, aParam.tiltX);
     WriteParam(aMsg, aParam.tiltY);
-    // We don't serialize convertToPointer and retargetedByPointerCapture since
-    // they are temporarily variable and should be reset to default.
+    WriteParam(aMsg, aParam.twist);
+    WriteParam(aMsg, aParam.tangentialPressure);
+    // We don't serialize convertToPointer since it's temporarily variable and
+    // should be reset to default.
   }
 
   static bool Read(const Message* aMsg, PickleIterator* aIter, paramType* aResult)
@@ -237,7 +239,9 @@ struct ParamTraits<mozilla::WidgetPointerHelper>
     bool rv;
     rv = ReadParam(aMsg, aIter, &aResult->pointerId) &&
          ReadParam(aMsg, aIter, &aResult->tiltX) &&
-         ReadParam(aMsg, aIter, &aResult->tiltY);
+         ReadParam(aMsg, aIter, &aResult->tiltY) &&
+         ReadParam(aMsg, aIter, &aResult->twist) &&
+         ReadParam(aMsg, aIter, &aResult->tangentialPressure);
     return rv;
   }
 };
-- 
cgit v1.2.3