Changeset 214703 in webkit


Ignore:
Timestamp:
Mar 31, 2017, 5:11:08 PM (9 years ago)
Author:
Simon Fraser
Message:

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:
Location:
trunk/Source/WebCore
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/ChangeLog

    r214702 r214703  
     12017-03-31  Simon Fraser  <simon.fraser@apple.com>
     2
     3        Rename DOMWindow's m_touchEventListenerCount to m_touchAndGestureEventListenerCount
     4        https://bugs.webkit.org/show_bug.cgi?id=170371
     5
     6        Reviewed by Tim Horton.
     7
     8        This count tracks touch and gesture event listeners, so name it appropriately.
     9
     10        * page/DOMWindow.cpp:
     11        (WebCore::DOMWindow::addEventListener):
     12        (WebCore::DOMWindow::removeEventListener):
     13        (WebCore::DOMWindow::removeAllEventListeners):
     14        * page/DOMWindow.h:
     15
    1162017-03-31  Simon Fraser  <simon.fraser@apple.com>
    217

  • trunk/Source/WebCore/page/DOMWindow.cpp

    r214472 r214703  
    18201820#if ENABLE(IOS_TOUCH_EVENTS)
    18211821    else if (eventNames().isTouchEventType(eventType))
    1822         ++m_touchEventListenerCount;
     1822        ++m_touchAndGestureEventListenerCount;
    18231823#endif
    18241824#if ENABLE(IOS_GESTURE_EVENTS)
    18251825    else if (eventNames().isGestureEventType(eventType))
    1826         ++m_touchEventListenerCount;
     1826        ++m_touchAndGestureEventListenerCount;
    18271827#endif
    18281828#if ENABLE(GAMEPAD)
    … …  
    19111911#if ENABLE(IOS_TOUCH_EVENTS)
    19121912    else if (eventNames().isTouchEventType(eventType)) {
    1913         ASSERT(m_touchEventListenerCount > 0);
    1914         --m_touchEventListenerCount;
     1913        ASSERT(m_touchAndGestureEventListenerCount > 0);
     1914        --m_touchAndGestureEventListenerCount;
    19151915    }
    19161916#endif
    19171917#if ENABLE(IOS_GESTURE_EVENTS)
    19181918    else if (eventNames().isGestureEventType(eventType)) {
    1919         ASSERT(m_touchEventListenerCount > 0);
    1920         --m_touchEventListenerCount;
     1919        ASSERT(m_touchAndGestureEventListenerCount > 0);
     1920        --m_touchAndGestureEventListenerCount;
    19211921    }
    19221922#endif
    … …  
    20242024
    20252025#if ENABLE(IOS_TOUCH_EVENTS) || ENABLE(IOS_GESTURE_EVENTS)
    2026     m_touchEventListenerCount = 0;
     2026    m_touchAndGestureEventListenerCount = 0;
    20272027#endif
    20282028

  • trunk/Source/WebCore/page/DOMWindow.h

    r214147 r214703  
    304304
    305305#if ENABLE(IOS_TOUCH_EVENTS) || ENABLE(IOS_GESTURE_EVENTS)
    306     bool hasTouchEventListeners() const { return m_touchEventListenerCount > 0; }
     306    bool hasTouchOrGestureEventListeners() const { return m_touchAndGestureEventListenerCount > 0; }
    307307#endif
    308308
    … …  
    391391
    392392#if ENABLE(IOS_TOUCH_EVENTS) || ENABLE(IOS_GESTURE_EVENTS)
    393     unsigned m_touchEventListenerCount { 0 };
     393    unsigned m_touchAndGestureEventListenerCount { 0 };
    394394#endif
    395395
Note: See TracChangeset for help on using the changeset viewer.