Sync 'identifier' in Touch.idl with Web Specification

https://bugs.webkit.org/show_bug.cgi?id=264533 Reviewed by Michael Catanzaro. This patch is to align 'identifier' with Web-Specification [1] by changing to 'long' / 'int'. [1] https://w3c.github.io/touch-events/#touch-interface * Source/WebCore/dom/Touch.idl: * Source/WebCore/dom/Touch.cpp: (Touch::Touch): (Touch::Touch): * Source/WebCore/dom/Touch.h: All use cases in 'arguments' as well (create): Canonical link: https://commits.webkit.org/270540@main
WebKit · Nov 10, 2023 · 514d977 · 514d977
1 parent 87eeda6
commit 514d977
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 8 deletions.
diff --git a/Source/WebCore/dom/Touch.cpp b/Source/WebCore/dom/Touch.cpp
@@ -63,7 +63,7 @@ static LayoutPoint scaledLocation(LocalFrame* frame, int pageX, int pageY)
     return { pageX * scaleFactor, pageY * scaleFactor };
 }
 
-Touch::Touch(LocalFrame* frame, EventTarget* target, unsigned identifier, int screenX, int screenY, int pageX, int pageY, int radiusX, int radiusY, float rotationAngle, float force)
+Touch::Touch(LocalFrame* frame, EventTarget* target, int identifier, int screenX, int screenY, int pageX, int pageY, int radiusX, int radiusY, float rotationAngle, float force)
     : m_target(target)
     , m_identifier(identifier)
     , m_clientX(pageX - contentsX(frame))
@@ -80,7 +80,7 @@ Touch::Touch(LocalFrame* frame, EventTarget* target, unsigned identifier, int sc
 {
 }
 
-Touch::Touch(EventTarget* target, unsigned identifier, int clientX, int clientY, int screenX, int screenY, int pageX, int pageY, int radiusX, int radiusY, float rotationAngle, float force, LayoutPoint absoluteLocation)
+Touch::Touch(EventTarget* target, int identifier, int clientX, int clientY, int screenX, int screenY, int pageX, int pageY, int radiusX, int radiusY, float rotationAngle, float force, LayoutPoint absoluteLocation)
     : m_target(target)
     , m_identifier(identifier)
     , m_clientX(clientX)

diff --git a/Source/WebCore/dom/Touch.h b/Source/WebCore/dom/Touch.h
@@ -41,15 +41,15 @@ class LocalFrame;
 class Touch : public RefCounted<Touch> {
 public:
     static Ref<Touch> create(LocalFrame* frame, EventTarget* target,
-            unsigned identifier, int screenX, int screenY, int pageX, int pageY,
+            int identifier, int screenX, int screenY, int pageX, int pageY,
             int radiusX, int radiusY, float rotationAngle, float force)
     {
         return adoptRef(*new Touch(frame, target, identifier, screenX, 
                 screenY, pageX, pageY, radiusX, radiusY, rotationAngle, force));
     }
 
     EventTarget* target() const { return m_target.get(); }
-    unsigned identifier() const { return m_identifier; }
+    int identifier() const { return m_identifier; }
     int clientX() const { return m_clientX; }
     int clientY() const { return m_clientY; }
     int screenX() const { return m_screenX; }
@@ -64,16 +64,16 @@ class Touch : public RefCounted<Touch> {
     Ref<Touch> cloneWithNewTarget(EventTarget*) const;
 
 private:
-    Touch(LocalFrame*, EventTarget*, unsigned identifier,
+    Touch(LocalFrame*, EventTarget*, int identifier,
             int screenX, int screenY, int pageX, int pageY,
             int radiusX, int radiusY, float rotationAngle, float force);
 
-    Touch(EventTarget*, unsigned identifier, int clientX, int clientY,
+    Touch(EventTarget*, int identifier, int clientX, int clientY,
         int screenX, int screenY, int pageX, int pageY,
         int radiusX, int radiusY, float rotationAngle, float force, LayoutPoint absoluteLocation);
 
     RefPtr<EventTarget> m_target;
-    unsigned m_identifier;
+    int m_identifier;
     int m_clientX;
     int m_clientY;
     int m_screenX;

diff --git a/Source/WebCore/dom/Touch.idl b/Source/WebCore/dom/Touch.idl
@@ -23,6 +23,8 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+// https://w3c.github.io/touch-events/#touch-interface
+
 [
     Conditional=TOUCH_EVENTS,
     Exposed=Window
@@ -34,7 +36,7 @@
     readonly attribute long                pageX;
     readonly attribute long                pageY;
     readonly attribute EventTarget         target;
-    readonly attribute unsigned long       identifier;
+    readonly attribute long                identifier;
     readonly attribute long                webkitRadiusX;
     readonly attribute long               webkitRadiusY;
     readonly attribute unrestricted float webkitRotationAngle;