Title: [255027] branches/safari-609-branch/Source/WebCore
Revision
255027
Author
[email protected]
Date
2020-01-23 13:44:30 -0800 (Thu, 23 Jan 2020)

Log Message

Cherry-pick r254789. rdar://problem/58807968

    iOS: Prepare deploying Ref/RefPtr in touch event code
    https://bugs.webkit.org/show_bug.cgi?id=206466

    Reviewed by Wenson Hsieh.

    Introduce a new variant of dispatchTouchEvent, which takes EventTargetTouchArrayMap that uses
    Ref<EventTarget> as keys instead of raw pointers to EventTarget as is the case in EventTargetTouchMap.

    * page/EventHandler.h:
    (WebCore::EventHandler::EventTargetTouchArrayMap): Added.
    (WebCore::EventHandler::dispatchTouchEvent): Added the declaration for new variant.

    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@254789 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Modified Paths

Diff

Modified: branches/safari-609-branch/Source/WebCore/ChangeLog (255026 => 255027)


--- branches/safari-609-branch/Source/WebCore/ChangeLog	2020-01-23 21:44:27 UTC (rev 255026)
+++ branches/safari-609-branch/Source/WebCore/ChangeLog	2020-01-23 21:44:30 UTC (rev 255027)
@@ -1,5 +1,38 @@
 2020-01-23  Russell Epstein  <[email protected]>
 
+        Cherry-pick r254789. rdar://problem/58807968
+
+    iOS: Prepare deploying Ref/RefPtr in touch event code
+    https://bugs.webkit.org/show_bug.cgi?id=206466
+    
+    Reviewed by Wenson Hsieh.
+    
+    Introduce a new variant of dispatchTouchEvent, which takes EventTargetTouchArrayMap that uses
+    Ref<EventTarget> as keys instead of raw pointers to EventTarget as is the case in EventTargetTouchMap.
+    
+    * page/EventHandler.h:
+    (WebCore::EventHandler::EventTargetTouchArrayMap): Added.
+    (WebCore::EventHandler::dispatchTouchEvent): Added the declaration for new variant.
+    
+    
+    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@254789 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+    2020-01-17  Ryosuke Niwa  <[email protected]>
+
+            iOS: Prepare deploying Ref/RefPtr in touch event code
+            https://bugs.webkit.org/show_bug.cgi?id=206466
+
+            Reviewed by Wenson Hsieh.
+
+            Introduce a new variant of dispatchTouchEvent, which takes EventTargetTouchArrayMap that uses
+            Ref<EventTarget> as keys instead of raw pointers to EventTarget as is the case in EventTargetTouchMap.
+
+            * page/EventHandler.h:
+            (WebCore::EventHandler::EventTargetTouchArrayMap): Added.
+            (WebCore::EventHandler::dispatchTouchEvent): Added the declaration for new variant.
+
+2020-01-23  Russell Epstein  <[email protected]>
+
         Cherry-pick r254761. rdar://problem/58807932
 
     [MSE] Decode glitches when watching videos on CNN.com

Modified: branches/safari-609-branch/Source/WebCore/page/EventHandler.h (255026 => 255027)


--- branches/safari-609-branch/Source/WebCore/page/EventHandler.h	2020-01-23 21:44:27 UTC (rev 255026)
+++ branches/safari-609-branch/Source/WebCore/page/EventHandler.h	2020-01-23 21:44:30 UTC (rev 255027)
@@ -220,6 +220,7 @@
 #if ENABLE(IOS_TOUCH_EVENTS) || ENABLE(IOS_GESTURE_EVENTS)
     using TouchArray = Vector<RefPtr<Touch>>;
     using EventTargetTouchMap = HashMap<EventTarget*, TouchArray*>;
+    using EventTargetTouchArrayMap = HashMap<Ref<EventTarget>, std::unique_ptr<TouchArray>>;
 #endif
 
 #if ENABLE(IOS_TOUCH_EVENTS) || ENABLE(IOS_GESTURE_EVENTS) || ENABLE(MAC_GESTURE_EVENTS)
@@ -228,6 +229,7 @@
 
 #if ENABLE(IOS_TOUCH_EVENTS)
     bool dispatchTouchEvent(const PlatformTouchEvent&, const AtomString&, const EventTargetTouchMap&, float, float);
+    bool dispatchTouchEvent(const PlatformTouchEvent&, const AtomString&, const EventTargetTouchArrayMap&, float, float);
     bool dispatchSimulatedTouchEvent(IntPoint location);
     Frame* touchEventTargetSubframe() const { return m_touchEventTargetSubframe.get(); }
     const TouchArray& touches() const { return m_touches; }
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to