⚠ Archived content — this site is no longer maintained.   Current WebKit documentation is at docs.webkit.org.

Changeset 244762 in webkit


Ignore:
Timestamp:
Apr 29, 2019, 4:55:51 PM (7 years ago)
Author:
Truitt Savell
Message:

Unreviewed, rolling out r244755.

Casued several test failures on iOS

Reverted changeset:

"Double-tapping a post to like doesn't work on Instagram.com
(needs 'dblclick' event)"
​https://bugs.webkit.org/show_bug.cgi?id=197347
​https://trac.webkit.org/changeset/244755

Location:
trunk
Files:
6 deleted
12 edited

Legend:

Unmodified
Added
Removed

  • trunk/LayoutTests/ChangeLog

    r244755 r244762  
     12019-04-29  Truitt Savell  <tsavell@apple.com>
     2
     3        Unreviewed, rolling out r244755.
     4
     5        Casued several test failures on iOS
     6
     7        Reverted changeset:
     8
     9        "Double-tapping a post to like doesn't work on Instagram.com
     10        (needs 'dblclick' event)"
     11        https://bugs.webkit.org/show_bug.cgi?id=197347
     12        https://trac.webkit.org/changeset/244755
     13
    1142019-04-29  Zalan Bujtas  <zalan@apple.com>
    215

  • trunk/Source/WebCore/ChangeLog

    r244756 r244762  
     12019-04-29  Truitt Savell  <tsavell@apple.com>
     2
     3        Unreviewed, rolling out r244755.
     4
     5        Casued several test failures on iOS
     6
     7        Reverted changeset:
     8
     9        "Double-tapping a post to like doesn't work on Instagram.com
     10        (needs 'dblclick' event)"
     11        https://bugs.webkit.org/show_bug.cgi?id=197347
     12        https://trac.webkit.org/changeset/244755
     13
    1142019-04-29  Alex Christensen  <achristensen@webkit.org>
    215

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

    r244755 r244762  
    220220    WEBCORE_EXPORT Node* deepestNodeAtLocation(const FloatPoint& viewportLocation);
    221221    WEBCORE_EXPORT Node* nodeRespondingToClickEvents(const FloatPoint& viewportLocation, FloatPoint& adjustedViewportLocation, SecurityOrigin* = nullptr);
    222     WEBCORE_EXPORT Node* nodeRespondingToDoubleClickEvent(const FloatPoint& viewportLocation, FloatPoint& adjustedViewportLocation);
    223222    WEBCORE_EXPORT Node* nodeRespondingToScrollWheelEvents(const FloatPoint& viewportLocation);
    224223

  • trunk/Source/WebCore/page/ios/FrameIOS.mm

    r244755 r244762  
    419419}
    420420
    421 Node* Frame::nodeRespondingToDoubleClickEvent(const FloatPoint& viewportLocation, FloatPoint& adjustedViewportLocation)
    422 {
    423     auto&& ancestorRespondingToDoubleClickEvent = [](const HitTestResult& hitTestResult, Node* terminationNode, IntRect* nodeBounds) -> Node* {
    424         if (nodeBounds)
    425             *nodeBounds = IntRect();
    426 
    427         auto* node = hitTestResult.innerNode();
    428         if (!node)
    429             return nullptr;
    430 
    431         for (; node && node != terminationNode; node = node->parentInComposedTree()) {
    432             if (!node->hasEventListeners(eventNames().dblclickEvent))
    433                 continue;
    434 #if ENABLE(TOUCH_EVENTS)
    435             if (!node->allowsDoubleTapGesture())
    436                 continue;
    437 #endif
    438             if (nodeBounds && node->renderer())
    439                 *nodeBounds = node->renderer()->absoluteBoundingBoxRect(true);
    440             return node;
    441         }
    442         return nullptr;
    443     };
    444 
    445     return qualifyingNodeAtViewportLocation(viewportLocation, adjustedViewportLocation, WTFMove(ancestorRespondingToDoubleClickEvent), true);
    446 }
    447 
    448421Node* Frame::nodeRespondingToScrollWheelEvents(const FloatPoint& viewportLocation)
    449422{

  • trunk/Source/WebKit/ChangeLog

    r244761 r244762  
     12019-04-29  Truitt Savell  <tsavell@apple.com>
     2
     3        Unreviewed, rolling out r244755.
     4
     5        Casued several test failures on iOS
     6
     7        Reverted changeset:
     8
     9        "Double-tapping a post to like doesn't work on Instagram.com
     10        (needs 'dblclick' event)"
     11        https://bugs.webkit.org/show_bug.cgi?id=197347
     12        https://trac.webkit.org/changeset/244755
     13
    1142019-04-29  Chris Dumez  <cdumez@apple.com>
    215

  • trunk/Source/WebKit/UIProcess/WebPageProxy.h

    r244755 r244762  
    12111211    void handleTap(const WebCore::FloatPoint&, OptionSet<WebKit::WebEvent::Modifier>, uint64_t layerTreeTransactionIdAtLastTouchStart);
    12121212    void didRecognizeLongPress();
    1213     void handleDoubleTapForDoubleClickAtPoint(const WebCore::IntPoint&, OptionSet<WebEvent::Modifier>, uint64_t layerTreeTransactionIdAtLastTouchStart);
    12141213
    12151214    void inspectorNodeSearchMovedToPosition(const WebCore::FloatPoint&);

  • trunk/Source/WebKit/UIProcess/ios/WKContentViewInteraction.h

    r244755 r244762  
    222222    RetainPtr<WKSyntheticTapGestureRecognizer> _doubleTapGestureRecognizer;
    223223    RetainPtr<UITapGestureRecognizer> _nonBlockingDoubleTapGestureRecognizer;
    224     RetainPtr<UITapGestureRecognizer> _doubleTapGestureRecognizerForDoubleClick;
    225224    RetainPtr<UITapGestureRecognizer> _twoFingerDoubleTapGestureRecognizer;
    226225    RetainPtr<UITapGestureRecognizer> _twoFingerSingleTapGestureRecognizer;

  • trunk/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm

    r244755 r244762  
    735735    [self addGestureRecognizer:_nonBlockingDoubleTapGestureRecognizer.get()];
    736736
    737     _doubleTapGestureRecognizerForDoubleClick = adoptNS([[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(_doubleTapRecognizedForDoubleClick:)]);
    738     [_doubleTapGestureRecognizerForDoubleClick setNumberOfTapsRequired:2];
    739     [_doubleTapGestureRecognizerForDoubleClick setDelegate:self];
    740     [_doubleTapGestureRecognizerForDoubleClick setEnabled:YES];
    741     [self addGestureRecognizer:_doubleTapGestureRecognizerForDoubleClick.get()];
    742 
    743737    [self _createAndConfigureDoubleTapGestureRecognizer];
    744738
    … …  
    874868    [self removeGestureRecognizer:_nonBlockingDoubleTapGestureRecognizer.get()];
    875869
    876     [_doubleTapGestureRecognizerForDoubleClick setDelegate:nil];
    877     [self removeGestureRecognizer:_doubleTapGestureRecognizerForDoubleClick.get()];
    878 
    879870    [_twoFingerDoubleTapGestureRecognizer setDelegate:nil];
    880871    [self removeGestureRecognizer:_twoFingerDoubleTapGestureRecognizer.get()];
    … …  
    950941    [self removeGestureRecognizer:_doubleTapGestureRecognizer.get()];
    951942    [self removeGestureRecognizer:_nonBlockingDoubleTapGestureRecognizer.get()];
    952     [self removeGestureRecognizer:_doubleTapGestureRecognizerForDoubleClick.get()];
    953943    [self removeGestureRecognizer:_twoFingerDoubleTapGestureRecognizer.get()];
    954944    [self removeGestureRecognizer:_twoFingerSingleTapGestureRecognizer.get()];
    … …  
    967957    [self addGestureRecognizer:_doubleTapGestureRecognizer.get()];
    968958    [self addGestureRecognizer:_nonBlockingDoubleTapGestureRecognizer.get()];
    969     [self addGestureRecognizer:_doubleTapGestureRecognizerForDoubleClick.get()];
    970959    [self addGestureRecognizer:_twoFingerDoubleTapGestureRecognizer.get()];
    971960    [self addGestureRecognizer:_twoFingerSingleTapGestureRecognizer.get()];
    … …  
    17911780        return YES;
    17921781
    1793     if (isSamePair(gestureRecognizer, otherGestureRecognizer, _nonBlockingDoubleTapGestureRecognizer.get(), _doubleTapGestureRecognizerForDoubleClick.get()))
    1794         return YES;
    1795 
    1796     if (isSamePair(gestureRecognizer, otherGestureRecognizer, _doubleTapGestureRecognizer.get(), _doubleTapGestureRecognizerForDoubleClick.get()))
    1797         return YES;
    1798 
    17991782    if (isSamePair(gestureRecognizer, otherGestureRecognizer, _highlightLongPressGestureRecognizer.get(), _previewSecondaryGestureRecognizer.get()))
    18001783        return YES;
    … …  
    19931976        || gestureRecognizer == _doubleTapGestureRecognizer
    19941977        || gestureRecognizer == _nonBlockingDoubleTapGestureRecognizer
    1995         || gestureRecognizer == _doubleTapGestureRecognizerForDoubleClick
    19961978        || gestureRecognizer == _twoFingerDoubleTapGestureRecognizer) {
    19971979
    … …  
    23942376    _lastInteractionLocation = gestureRecognizer.location;
    23952377    _isDoubleTapPending = YES;
    2396 }
    2397 
    2398 - (void)_doubleTapRecognizedForDoubleClick:(UITapGestureRecognizer *)gestureRecognizer
    2399 {
    2400     _page->handleDoubleTapForDoubleClickAtPoint(WebCore::IntPoint(gestureRecognizer.location), WebKit::webEventModifierFlags(gestureRecognizerModifierFlags(gestureRecognizer)), _layerTreeTransactionIdAtLastTouchStart);
    24012378}
    24022379

  • trunk/Source/WebKit/UIProcess/ios/WebPageProxyIOS.mm

    r244755 r244762  
    868868}
    869869
    870 void WebPageProxy::handleDoubleTapForDoubleClickAtPoint(const WebCore::IntPoint& point, OptionSet<WebEvent::Modifier> modifiers, uint64_t layerTreeTransactionIdAtLastTouchStart)
    871 {
    872     process().send(Messages::WebPage::HandleDoubleTapForDoubleClickAtPoint(point, modifiers, layerTreeTransactionIdAtLastTouchStart), m_pageID);
    873 }
    874 
    875870void WebPageProxy::inspectorNodeSearchMovedToPosition(const WebCore::FloatPoint& position)
    876871{

  • trunk/Source/WebKit/WebProcess/WebPage/WebPage.h

    r244755 r244762  
    623623    void tapHighlightAtPosition(uint64_t requestID, const WebCore::FloatPoint&);
    624624    void didRecognizeLongPress();
    625     void handleDoubleTapForDoubleClickAtPoint(const WebCore::IntPoint&, OptionSet<WebKit::WebEvent::Modifier>, uint64_t lastLayerTreeTransactionId);
    626625
    627626    void inspectorNodeSearchMovedToPosition(const WebCore::FloatPoint&);

  • trunk/Source/WebKit/WebProcess/WebPage/WebPage.messages.in

    r244755 r244762  
    5858    TapHighlightAtPosition(uint64_t requestID, WebCore::FloatPoint point)
    5959    DidRecognizeLongPress()
    60     HandleDoubleTapForDoubleClickAtPoint(WebCore::IntPoint point, OptionSet<WebKit::WebEvent::Modifier> modifiers, uint64_t lastLayerTreeTransactionId)
    6160    InspectorNodeSearchMovedToPosition(WebCore::FloatPoint point)
    6261    InspectorNodeSearchEndedAtPosition(WebCore::FloatPoint point)

  • trunk/Source/WebKit/WebProcess/WebPage/ios/WebPageIOS.mm

    r244755 r244762  
    723723}
    724724
    725 void WebPage::handleDoubleTapForDoubleClickAtPoint(const IntPoint& point, OptionSet<WebEvent::Modifier> modifiers, uint64_t lastLayerTreeTransactionId)
    726 {
    727     FloatPoint adjustedPoint;
    728     auto* nodeRespondingToDoubleClick = m_page->mainFrame().nodeRespondingToDoubleClickEvent(point, adjustedPoint);
    729     if (!nodeRespondingToDoubleClick)
    730         return;
    731 
    732     auto* frameRespondingToDoubleClick = nodeRespondingToDoubleClick->document().frame();
    733     if (!frameRespondingToDoubleClick || lastLayerTreeTransactionId < WebFrame::fromCoreFrame(*frameRespondingToDoubleClick)->firstLayerTreeTransactionIDAfterDidCommitLoad())
    734         return;
    735 
    736     bool shiftKey = modifiers.contains(WebEvent::Modifier::ShiftKey);
    737     bool ctrlKey = modifiers.contains(WebEvent::Modifier::ControlKey);
    738     bool altKey = modifiers.contains(WebEvent::Modifier::AltKey);
    739     bool metaKey = modifiers.contains(WebEvent::Modifier::MetaKey);
    740     auto roundedAdjustedPoint = roundedIntPoint(adjustedPoint);
    741     nodeRespondingToDoubleClick->document().frame()->eventHandler().handleMousePressEvent(PlatformMouseEvent(roundedAdjustedPoint, roundedAdjustedPoint, LeftButton, PlatformEvent::MousePressed, 2, shiftKey, ctrlKey, altKey, metaKey, WallTime::now(), 0, WebCore::NoTap));
    742     if (m_isClosed)
    743         return;
    744     nodeRespondingToDoubleClick->document().frame()->eventHandler().handleMouseReleaseEvent(PlatformMouseEvent(roundedAdjustedPoint, roundedAdjustedPoint, LeftButton, PlatformEvent::MouseReleased, 2, shiftKey, ctrlKey, altKey, metaKey, WallTime::now(), 0, WebCore::NoTap));
    745 }
    746 
    747725void WebPage::requestFocusedElementInformation(WebKit::CallbackID callbackID)
    748726{
Note: See TracChangeset for help on using the changeset viewer.