Title: [214878] branches/safari-603-branch/Source/WebCore
- Revision
- 214878
- Author
- [email protected]
- Date
- 2017-04-04 01:00:42 -0700 (Tue, 04 Apr 2017)
Log Message
Cherry-pick r214703. rdar://problem/31407633
Modified Paths
Diff
Modified: branches/safari-603-branch/Source/WebCore/ChangeLog (214877 => 214878)
--- branches/safari-603-branch/Source/WebCore/ChangeLog 2017-04-04 08:00:39 UTC (rev 214877)
+++ branches/safari-603-branch/Source/WebCore/ChangeLog 2017-04-04 08:00:42 UTC (rev 214878)
@@ -1,5 +1,24 @@
2017-04-03 Jason Marcell <[email protected]>
+ Cherry-pick r214703. rdar://problem/31407633
+
+ 2017-03-31 Simon Fraser <[email protected]>
+
+ Rename DOMWindow's m_touchEventListenerCount to m_touchAndGestureEventListenerCount
+ https://bugs.webkit.org/show_bug.cgi?id=170371
+
+ Reviewed by Tim Horton.
+
+ This count tracks touch and gesture event listeners, so name it appropriately.
+
+ * page/DOMWindow.cpp:
+ (WebCore::DOMWindow::addEventListener):
+ (WebCore::DOMWindow::removeEventListener):
+ (WebCore::DOMWindow::removeAllEventListeners):
+ * page/DOMWindow.h:
+
+2017-04-03 Jason Marcell <[email protected]>
+
Cherry-pick r214702. rdar://problem/31407633
2017-03-31 Simon Fraser <[email protected]>
Modified: branches/safari-603-branch/Source/WebCore/page/DOMWindow.cpp (214877 => 214878)
--- branches/safari-603-branch/Source/WebCore/page/DOMWindow.cpp 2017-04-04 08:00:39 UTC (rev 214877)
+++ branches/safari-603-branch/Source/WebCore/page/DOMWindow.cpp 2017-04-04 08:00:42 UTC (rev 214878)
@@ -1817,11 +1817,11 @@
#endif
#if ENABLE(IOS_TOUCH_EVENTS)
else if (eventNames().isTouchEventType(eventType))
- ++m_touchEventListenerCount;
+ ++m_touchAndGestureEventListenerCount;
#endif
#if ENABLE(IOS_GESTURE_EVENTS)
else if (eventNames().isGestureEventType(eventType))
- ++m_touchEventListenerCount;
+ ++m_touchAndGestureEventListenerCount;
#endif
#if ENABLE(GAMEPAD)
else if (eventNames().isGamepadEventType(eventType))
@@ -1908,14 +1908,14 @@
#endif
#if ENABLE(IOS_TOUCH_EVENTS)
else if (eventNames().isTouchEventType(eventType)) {
- ASSERT(m_touchEventListenerCount > 0);
- --m_touchEventListenerCount;
+ ASSERT(m_touchAndGestureEventListenerCount > 0);
+ --m_touchAndGestureEventListenerCount;
}
#endif
#if ENABLE(IOS_GESTURE_EVENTS)
else if (eventNames().isGestureEventType(eventType)) {
- ASSERT(m_touchEventListenerCount > 0);
- --m_touchEventListenerCount;
+ ASSERT(m_touchAndGestureEventListenerCount > 0);
+ --m_touchAndGestureEventListenerCount;
}
#endif
#if ENABLE(GAMEPAD)
@@ -2021,7 +2021,7 @@
#endif
#if ENABLE(IOS_TOUCH_EVENTS) || ENABLE(IOS_GESTURE_EVENTS)
- m_touchEventListenerCount = 0;
+ m_touchAndGestureEventListenerCount = 0;
#endif
#if ENABLE(TOUCH_EVENTS)
Modified: branches/safari-603-branch/Source/WebCore/page/DOMWindow.h (214877 => 214878)
--- branches/safari-603-branch/Source/WebCore/page/DOMWindow.h 2017-04-04 08:00:39 UTC (rev 214877)
+++ branches/safari-603-branch/Source/WebCore/page/DOMWindow.h 2017-04-04 08:00:42 UTC (rev 214878)
@@ -327,7 +327,7 @@
void resetAllGeolocationPermission();
#if ENABLE(IOS_TOUCH_EVENTS) || ENABLE(IOS_GESTURE_EVENTS)
- bool hasTouchEventListeners() const { return m_touchEventListenerCount > 0; }
+ bool hasTouchOrGestureEventListeners() const { return m_touchAndGestureEventListenerCount > 0; }
#endif
#if ENABLE(USER_MESSAGE_HANDLERS)
@@ -409,7 +409,7 @@
#endif
#if ENABLE(IOS_TOUCH_EVENTS) || ENABLE(IOS_GESTURE_EVENTS)
- unsigned m_touchEventListenerCount { 0 };
+ unsigned m_touchAndGestureEventListenerCount { 0 };
#endif
#if ENABLE(GAMEPAD)
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
