Changeset 201377 in webkit


Ignore:
Timestamp:
May 25, 2016 4:13:32 AM (8 years ago)
Author:
commit-queue@webkit.org
Message:

Purge PassRefPtr from TouchList
https://bugs.webkit.org/show_bug.cgi?id=157985

Patch by Nael Ouedraogo <nael.ouedraogo@crf.canon.fr> on 2016-05-25
Reviewed by Darin Adler.

Use RefPtr&& argument instead of PassRefPtr in append()

  • dom/TouchList.h:

(WebCore::TouchList::append):

  • page/EventHandler.cpp:

(WebCore::EventHandler::handleTouchEvent):

Location:
trunk/Source/WebCore
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/Source/WebCore/ChangeLog

    r201374 r201377  
     12016-05-25  Nael Ouedraogo  <nael.ouedraogo@crf.canon.fr>
     2
     3        Purge PassRefPtr from TouchList
     4        https://bugs.webkit.org/show_bug.cgi?id=157985
     5
     6        Reviewed by Darin Adler.
     7
     8        Use RefPtr&& argument instead of PassRefPtr in append()
     9
     10        * dom/TouchList.h:
     11        (WebCore::TouchList::append):
     12        * page/EventHandler.cpp:
     13        (WebCore::EventHandler::handleTouchEvent):
     14
    1152016-05-25  Antoine Quint  <graouts@apple.com>
    216
  • trunk/Source/WebCore/dom/TouchList.h

    r184225 r201377  
    2323 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
    2424 */
    25 
    26 #ifndef TouchList_h
    27 #define TouchList_h
     25#pragma once
    2826
    2927#if ENABLE(IOS_TOUCH_EVENTS)
     
    4947    const Touch* item(unsigned) const;
    5048
    51     void append(const PassRefPtr<Touch> touch) { m_values.append(touch); }
     49    void append(RefPtr<Touch>&& touch) { m_values.append(WTFMove(touch)); }
    5250
    5351private:
    5452    TouchList() {}
    5553
    56     Vector<RefPtr<Touch> > m_values;
     54    Vector<RefPtr<Touch>> m_values;
    5755};
    5856
     
    6159#endif // ENABLE(TOUCH_EVENTS)
    6260
    63 #endif /* TouchList_h */
  • trunk/Source/WebCore/page/EventHandler.cpp

    r201292 r201377  
    39093909        int adjustedPageY = lroundf(pagePoint.y() / scaleFactor);
    39103910
    3911         RefPtr<Touch> touch = Touch::create(targetFrame, touchTarget.get(), point.id(),
    3912                                             point.screenPos().x(), point.screenPos().y(),
    3913                                             adjustedPageX, adjustedPageY,
    3914                                             point.radiusX(), point.radiusY(), point.rotationAngle(), point.force());
     3911        auto touch = Touch::create(targetFrame, touchTarget.get(), point.id(),
     3912            point.screenPos().x(), point.screenPos().y(), adjustedPageX, adjustedPageY,
     3913            point.radiusX(), point.radiusY(), point.rotationAngle(), point.force());
    39153914
    39163915        // Ensure this target's touch list exists, even if it ends up empty, so it can always be passed to TouchEvent::Create below.
     
    39223921        // released or cancelled it will only appear in the changedTouches list.
    39233922        if (pointState != PlatformTouchPoint::TouchReleased && pointState != PlatformTouchPoint::TouchCancelled) {
    3924             touches->append(touch);
    3925             targetTouchesIterator->value->append(touch);
     3923            touches->append(touch.copyRef());
     3924            targetTouchesIterator->value->append(touch.copyRef());
    39263925        }
    39273926
     
    39363935            if (!changedTouches[pointState].m_touches)
    39373936                changedTouches[pointState].m_touches = TouchList::create();
    3938             changedTouches[pointState].m_touches->append(touch);
     3937            changedTouches[pointState].m_touches->append(WTFMove(touch));
    39393938            changedTouches[pointState].m_targets.add(touchTarget);
    39403939        }
Note: See TracChangeset for help on using the changeset viewer.