Title: [214874] branches/safari-603-branch/Source/WebCore
Revision
214874
Author
[email protected]
Date
2017-04-04 01:00:32 -0700 (Tue, 04 Apr 2017)

Log Message

Cherry-pick r214648. rdar://problem/31408453

Modified Paths

Diff

Modified: branches/safari-603-branch/Source/WebCore/ChangeLog (214873 => 214874)


--- branches/safari-603-branch/Source/WebCore/ChangeLog	2017-04-04 08:00:29 UTC (rev 214873)
+++ branches/safari-603-branch/Source/WebCore/ChangeLog	2017-04-04 08:00:32 UTC (rev 214874)
@@ -1,5 +1,22 @@
 2017-04-03  Jason Marcell  <[email protected]>
 
+        Cherry-pick r214648. rdar://problem/31408453
+
+    2017-03-30  Simon Fraser  <[email protected]>
+
+            Minor cleanup checking for gesture event names
+            https://bugs.webkit.org/show_bug.cgi?id=170319
+
+            Reviewed by Tim Horton.
+
+            Just use isGestureEventType() in a couple of places.
+
+            * dom/Node.cpp:
+            (WebCore::tryAddEventListener):
+            (WebCore::tryRemoveEventListener):
+
+2017-04-03  Jason Marcell  <[email protected]>
+
         Cherry-pick r214640. rdar://problem/31408453
 
     2017-03-30  Simon Fraser  <[email protected]>

Modified: branches/safari-603-branch/Source/WebCore/dom/Node.cpp (214873 => 214874)


--- branches/safari-603-branch/Source/WebCore/dom/Node.cpp	2017-04-04 08:00:29 UTC (rev 214873)
+++ branches/safari-603-branch/Source/WebCore/dom/Node.cpp	2017-04-04 08:00:32 UTC (rev 214874)
@@ -1964,7 +1964,7 @@
 #endif // PLATFORM(IOS)
 
 #if ENABLE(IOS_GESTURE_EVENTS) && ENABLE(TOUCH_EVENTS)
-    if (eventType == eventNames().gesturestartEvent || eventType == eventNames().gesturechangeEvent || eventType == eventNames().gestureendEvent)
+    if (eventNames().isGestureEventType(eventType))
         targetNode->document().addTouchEventHandler(targetNode);
 #endif
 
@@ -2005,7 +2005,7 @@
 #endif // PLATFORM(IOS)
 
 #if ENABLE(IOS_GESTURE_EVENTS) && ENABLE(TOUCH_EVENTS)
-    if (eventType == eventNames().gesturestartEvent || eventType == eventNames().gesturechangeEvent || eventType == eventNames().gestureendEvent)
+    if (eventNames().isGestureEventType(eventType))
         targetNode->document().removeTouchEventHandler(targetNode);
 #endif
 
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to