Attachment 361100 Details for Bug 194232 – Patch for landing

[patch] Patch for landing

bug-194232-20190204232544.patch (text/plain), 4.00 KB, created by Antoine Quint on 2019-02-04 14:25:45 PST

(hide)

Description:

Filename:

MIME Type:

Creator: Antoine Quint

Created: 2019-02-04 14:25:45 PST

Size: 4.00 KB

patch

obsolete

>Subversion Revision: 240929
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index cfb0ee9443fc4f0c2569637ec0ca8a029dcf3321..b38dd6e6771d8730cb7277e9b8d937d7070f6ebd 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,20 @@
>+2019-02-04  Antoine Quint  <graouts@apple.com>
>+
>+        Use constants for pointer types
>+        https://bugs.webkit.org/show_bug.cgi?id=194232
>+
>+        Reviewed by Dean Jackson.
>+
>+        We cannot use an enum for the pointer type since a custom pointer type can be created by developers when creating a
>+        pointer event using JavaScript, but we can at least used string constants for the ones created internally.
>+
>+        * dom/PointerEvent.cpp:
>+        (WebCore::PointerEvent::mousePointerType):
>+        (WebCore::PointerEvent::penPointerType):
>+        (WebCore::PointerEvent::touchPointerType):
>+        * dom/PointerEvent.h:
>+        * dom/ios/PointerEventIOS.cpp:
>+
> 2019-02-04  Antoine Quint  <graouts@apple.com>
> 
>         Use a dedicated type instead of int32_t for pointer identifiers
>diff --git a/Source/WebCore/dom/PointerEvent.cpp b/Source/WebCore/dom/PointerEvent.cpp
>index 5184b28e1fe9b50e3804148a815b07d917d56828..fb62c35a479303a5d17e8bcd244495de06b39b11 100644
>--- a/Source/WebCore/dom/PointerEvent.cpp
>+++ b/Source/WebCore/dom/PointerEvent.cpp
>@@ -30,6 +30,24 @@
> 
> namespace WebCore {
> 
>+const String& PointerEvent::mousePointerType()
>+{
>+    static NeverDestroyed<const String> mouseType(MAKE_STATIC_STRING_IMPL("mouse"));
>+    return mouseType;
>+}
>+
>+const String& PointerEvent::penPointerType()
>+{
>+    static NeverDestroyed<const String> penType(MAKE_STATIC_STRING_IMPL("pen"));
>+    return penType;
>+}
>+
>+const String& PointerEvent::touchPointerType()
>+{
>+    static NeverDestroyed<const String> touchType(MAKE_STATIC_STRING_IMPL("touch"));
>+    return touchType;
>+}
>+
> PointerEvent::PointerEvent() = default;
> 
> PointerEvent::PointerEvent(const AtomicString& type, Init&& initializer)
>diff --git a/Source/WebCore/dom/PointerEvent.h b/Source/WebCore/dom/PointerEvent.h
>index 64fac5f44bdf1b02020c291abd8d01ca574da31c..de780931bd490e149a96edd4b30f11ea544a22a3 100644
>--- a/Source/WebCore/dom/PointerEvent.h
>+++ b/Source/WebCore/dom/PointerEvent.h
>@@ -48,7 +48,7 @@ public:
>         long tiltX { 0 };
>         long tiltY { 0 };
>         long twist { 0 };
>-        String pointerType { "mouse"_s };
>+        String pointerType { PointerEvent::mousePointerType() };
>         bool isPrimary { false };
>     };
> 
>@@ -85,6 +85,10 @@ public:
>     static Ref<PointerEvent> create(const PlatformTouchEvent&, unsigned touchIndex, bool isPrimary, Ref<WindowProxy>&&);
> #endif
> 
>+    static const String& mousePointerType();
>+    static const String& penPointerType();
>+    static const String& touchPointerType();
>+
>     virtual ~PointerEvent();
> 
>     PointerID pointerId() const { return m_pointerId; }
>@@ -117,7 +121,7 @@ private:
>     long m_tiltX { 0 };
>     long m_tiltY { 0 };
>     long m_twist { 0 };
>-    String m_pointerType { "mouse"_s };
>+    String m_pointerType { PointerEvent::mousePointerType() };
>     bool m_isPrimary { false };
> };
> 
>diff --git a/Source/WebCore/dom/ios/PointerEventIOS.cpp b/Source/WebCore/dom/ios/PointerEventIOS.cpp
>index 805ad348c5da94b4ae28e783212e21a057c01915..4502400f8ad496e876c14b4fd2a98afe0bfea008 100644
>--- a/Source/WebCore/dom/ios/PointerEventIOS.cpp
>+++ b/Source/WebCore/dom/ios/PointerEventIOS.cpp
>@@ -69,7 +69,7 @@ PointerEvent::PointerEvent(const AtomicString& type, const PlatformTouchEvent& e
>     , m_width(2 * event.radiusXAtIndex(index))
>     , m_height(2 * event.radiusYAtIndex(index))
>     , m_pressure(event.forceAtIndex(index))
>-    , m_pointerType(event.touchTypeAtIndex(index) == PlatformTouchPoint::TouchType::Stylus ? "pen"_s : "touch"_s)
>+    , m_pointerType(event.touchTypeAtIndex(index) == PlatformTouchPoint::TouchType::Stylus ? PointerEvent::penPointerType() : PointerEvent::touchPointerType())
>     , m_isPrimary(isPrimary)
> {
>     // See https://github.com/w3c/pointerevents/issues/274. We might expose the azimuth and altitude

Flags:

graouts: commit-queue+

Actions: View | Formatted Diff | Diff

Attachments on bug 194232: 361077 | 361099 | 361100