Bug 1680669 - part 7: Change the type of width and height of `Poi…

…nterEvent` to `double` r=smaug The values may be used with the coords of `MouseEvent`. Therefore, they need to be `double` right now. Differential Revision: https://phabricator.services.mozilla.com/D222729
glandium · Dec 3, 2024 · 0e81686 · 0e81686
1 parent 71ada50
commit 0e81686
Show file tree

Hide file tree

Showing 5 changed files with 36 additions and 12 deletions.
diff --git a/dom/events/PointerEvent.cpp b/dom/events/PointerEvent.cpp
@@ -246,12 +246,12 @@ int32_t PointerEvent::PointerId() {
              : mEvent->AsPointerEvent()->pointerId;
 }
 
-int32_t PointerEvent::Width() {
-  return ShouldResistFingerprinting() ? 1 : mEvent->AsPointerEvent()->mWidth;
+double PointerEvent::Width() const {
+  return ShouldResistFingerprinting() ? 1.0 : mEvent->AsPointerEvent()->mWidth;
 }
 
-int32_t PointerEvent::Height() {
-  return ShouldResistFingerprinting() ? 1 : mEvent->AsPointerEvent()->mHeight;
+double PointerEvent::Height() const {
+  return ShouldResistFingerprinting() ? 1.0 : mEvent->AsPointerEvent()->mHeight;
 }
 
 float PointerEvent::Pressure() {

diff --git a/dom/events/PointerEvent.h b/dom/events/PointerEvent.h
@@ -41,8 +41,8 @@ class PointerEvent : public MouseEvent {
   PointerEvent* AsPointerEvent() final { return this; }
 
   int32_t PointerId();
-  int32_t Width();
-  int32_t Height();
+  double Width() const;
+  double Height() const;
   float Pressure();
   float TangentialPressure();
   int32_t TiltX();

diff --git a/dom/webidl/PointerEvent.webidl b/dom/webidl/PointerEvent.webidl
@@ -14,8 +14,8 @@ interface PointerEvent : MouseEvent
 
   readonly attribute long pointerId;
 
-  readonly attribute long width;
-  readonly attribute long height;
+  readonly attribute double width;
+  readonly attribute double height;
   readonly attribute float pressure;
   readonly attribute float tangentialPressure;
   readonly attribute long tiltX;
@@ -35,8 +35,8 @@ interface PointerEvent : MouseEvent
 dictionary PointerEventInit : MouseEventInit
 {
   long pointerId = 0;
-  long width = 1;
-  long height = 1;
+  double width = 1.0;
+  double height = 1.0;
   float pressure = 0;
   float tangentialPressure = 0;
   long tiltX;

diff --git a/testing/web-platform/tests/pointerevents/pointerevent_fractional_coordinates_untrusted.html b/testing/web-platform/tests/pointerevents/pointerevent_fractional_coordinates_untrusted.html
@@ -162,6 +162,30 @@
     testFlooredMatch("-1.5 - -1.0", data.cls, event, smallerNegativeDict2);
   }
 }
+
+const dictAlwaysDouble = {
+  width: 0.111111111111,
+  height: 0.222222222222,
+};
+
+function testExactlyMatchAlwaysDouble(event, dict) {
+  test(() => {
+    assert_equals(event["width"], dict["width"]);
+  }, `PointerEvent.${event.type}.width`);
+  test(() => {
+    assert_equals(event["height"], dict["height"]);
+  }, `PointerEvent.${event.type}.height`);
+}
+
+for (const type of ["pointerdown", "pointerup", "pointermove", "pointercancel",
+                    "gotpointercapture", "lostpointercapture",
+                    "pointerrawupdate",
+                    "pointerover", "pointerout", "pointerenter", "pointerleave",
+                    "foo"]) {
+  const event = new PointerEvent(type, dictAlwaysDouble);
+  testExactlyMatchAlwaysDouble(event, dictAlwaysDouble);
+}
+
 </script>
 </head>
 <body></body>

diff --git a/widget/MouseEvents.h b/widget/MouseEvents.h
@@ -847,8 +847,8 @@ class WidgetPointerEvent : public WidgetMouseEvent {
     return result;
   }
 
-  int32_t mWidth = 1;
-  int32_t mHeight = 1;
+  double mWidth = 1.0;
+  double mHeight = 1.0;
   bool mIsPrimary = true;
   bool mFromTouchEvent = false;