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

Changeset 204072 in webkit


Ignore:
Timestamp:
Aug 2, 2016, 11:16:10 PM (10 years ago)
Author:
bshafiei@apple.com
Message:

Merge r204062. rdar://problem/27592936

Location:
branches/safari-602-branch
Files:
8 edited
2 moved

Legend:

Unmodified
Added
Removed
  • branches/safari-602-branch/LayoutTests/ChangeLog

    r204071 r204072  
     12016-08-02  Babak Shafiei  <bshafiei@apple.com>
     2
     3        Merge r204062. rdar://problem/27592936
     4
     5    2016-08-02  Nan Wang  <n_wang@apple.com>
     6
     7            AX: Simulated touch events are not working on iOS
     8            https://bugs.webkit.org/show_bug.cgi?id=160395
     9            <rdar://problem/27633597>
     10
     11            Reviewed by Chris Fleizach.
     12
     13            * accessibility/ios-simulator/press-fires-touch-events-expected.txt: Added.
     14            * accessibility/ios-simulator/press-fires-touch-events.html: Added.
     15            * platform/ios-simulator-wk2/TestExpectations:
     16            * platform/ios-simulator/ios/accessibility/press-fires-touch-events-expected.txt: Removed.
     17            * platform/ios-simulator/ios/accessibility/press-fires-touch-events.html: Removed.
     18
    1192016-08-02  Babak Shafiei  <bshafiei@apple.com>
    220
  • branches/safari-602-branch/LayoutTests/accessibility/ios-simulator/press-fires-touch-events.html

    r204071 r204072  
    22<html>
    33<head>
    4 <script src="../../../../resources/js-test-pre.js"></script>
     4<script src="../../resources/js-test-pre.js"></script>
    55<script>
    66var successfullyParsed = false;
     
    4141</script>
    4242
    43 <script src="../../../../resources/js-test-post.js"></script>
     43<script src="../../resources/js-test-post.js"></script>
    4444
    4545</body>
  • branches/safari-602-branch/LayoutTests/platform/ios-simulator-wk2/TestExpectations

    r203305 r204072  
    18111811fast/writing-mode/japanese-lr-selection.html [ Failure ]
    18121812fast/writing-mode/japanese-rl-selection.html [ Failure ]
    1813 platform/ios-simulator/ios/accessibility/press-fires-touch-events.html [ Failure ]
     1813accessibility/ios-simulator/press-fires-touch-events.html [ Skip ]
    18141814
    18151815fast/text/combining-character-sequence-vertical.html [ ImageOnlyFailure ]
  • branches/safari-602-branch/Source/WebCore/ChangeLog

    r204071 r204072  
     12016-08-02  Babak Shafiei  <bshafiei@apple.com>
     2
     3        Merge r204062. rdar://problem/27592936
     4
     5    2016-08-02  Nan Wang  <n_wang@apple.com>
     6
     7            AX: Simulated touch events are not working on iOS
     8            https://bugs.webkit.org/show_bug.cgi?id=160395
     9            <rdar://problem/27633597>
     10
     11            Reviewed by Chris Fleizach.
     12
     13            We should mark the simulated touch as a potential tap otherwise it won't
     14            be handled on iOS. Also, we need to dispatch both touch start and touch end
     15            to mimic the real touch events. Last, added a has event listeners check,
     16            because iOS is dispatching mouse click events for elements without touch event
     17            listeners.
     18
     19            Test: accessibility/ios-simulator/press-fires-touch-events.html
     20
     21            * accessibility/AccessibilityObject.cpp:
     22            (WebCore::AccessibilityObject::press):
     23            (WebCore::AccessibilityObject::dispatchTouchEvent):
     24            * page/ios/EventHandlerIOS.mm:
     25            (WebCore::EventHandler::dispatchSimulatedTouchEvent):
     26            * platform/ios/PlatformEventFactoryIOS.mm:
     27            (WebCore::PlatformTouchEventBuilder::PlatformTouchEventBuilder):
     28
    1292016-08-02  Babak Shafiei  <bshafiei@apple.com>
    230
  • branches/safari-602-branch/Source/WebCore/accessibility/AccessibilityObject.cpp

    r204071 r204072  
    923923    UserGestureIndicator gestureIndicator(ProcessingUserGesture, document);
    924924   
    925     // FIXME: dispatchTouchEvent() is not dispatching the touch event correctly.
    926     bool dispatchedTouchEvent = dispatchTouchEvent();
     925    bool dispatchedTouchEvent = false;
     926#if PLATFORM(IOS)
     927    if (hasTouchEventListener())
     928        dispatchedTouchEvent = dispatchTouchEvent();
     929#endif
    927930    if (!dispatchedTouchEvent)
    928931        pressElement->accessKeyAction(true);
     
    939942        return false;
    940943
    941     frame->eventHandler().dispatchSimulatedTouchEvent(clickPoint());
     944    handled = frame->eventHandler().dispatchSimulatedTouchEvent(clickPoint());
    942945#endif
    943946    return handled;
  • branches/safari-602-branch/Source/WebCore/page/ios/EventHandlerIOS.mm

    r201038 r204072  
    109109{
    110110    bool handled = handleTouchEvent(PlatformEventFactory::createPlatformSimulatedTouchEvent(PlatformEvent::TouchStart, location));
    111     if (handled)
    112         handleTouchEvent(PlatformEventFactory::createPlatformSimulatedTouchEvent(PlatformEvent::TouchEnd, location));
     111    handled |= handleTouchEvent(PlatformEventFactory::createPlatformSimulatedTouchEvent(PlatformEvent::TouchEnd, location));
    113112    return handled;
    114113}
  • branches/safari-602-branch/Source/WebCore/platform/ios/PlatformEventFactoryIOS.mm

    r176904 r204072  
    273273        m_position = location;
    274274        m_globalPosition = location;
     275        m_isPotentialTap = true;
    275276       
    276277        unsigned touchCount = 1;
  • branches/safari-602-branch/Tools/ChangeLog

    r204071 r204072  
     12016-08-02  Babak Shafiei  <bshafiei@apple.com>
     2
     3        Merge r204062. rdar://problem/27592936
     4
     5    2016-08-02  Nan Wang  <n_wang@apple.com>
     6
     7            AX: Simulated touch events are not working on iOS
     8            https://bugs.webkit.org/show_bug.cgi?id=160395
     9            <rdar://problem/27633597>
     10
     11            Reviewed by Chris Fleizach.
     12
     13            * WebKitTestRunner/InjectedBundle/ios/AccessibilityUIElementIOS.mm:
     14            (WTR::AccessibilityUIElement::press):
     15            (WTR::AccessibilityUIElement::setSelectedChild):
     16
    1172016-08-02  Babak Shafiei  <bshafiei@apple.com>
    218
  • branches/safari-602-branch/Tools/WebKitTestRunner/InjectedBundle/ios/AccessibilityUIElementIOS.mm

    r204071 r204072  
    807807void AccessibilityUIElement::press()
    808808{
     809    [m_element _accessibilityActivate];
    809810}
    810811
Note: See TracChangeset for help on using the changeset viewer.