Changeset 179909 in webkit


Ignore:
Timestamp:
Feb 10, 2015 6:08:49 PM (9 years ago)
Author:
Conrad Shultz
Message:

Clients need the ability to hook into immediate action lifecycle
https://bugs.webkit.org/show_bug.cgi?id=141449

Reviewed by Tim Horton.

  • UIProcess/API/Cocoa/WKViewPrivate.h:

Expose new methods.

  • UIProcess/API/mac/WKView.mm:

(-[WKView _prepareForImmediateActionAnimation]):
(-[WKView _cancelImmediateActionAnimation]):
(-[WKView _completeImmediateActionAnimation]):
Stub implementations.

  • UIProcess/mac/WKImmediateActionController.mm:

(-[WKImmediateActionController immediateActionRecognizerWillPrepare:]):
Send -_prepareForImmediateActionAnimation.
(-[WKImmediateActionController immediateActionRecognizerDidCancelAnimation:]):
Send -_cancelImmediateActionAnimation.
(-[WKImmediateActionController immediateActionRecognizerDidCompleteAnimation:]):
Send -_completeImmediateActionAnimation.

Location:
trunk/Source/WebKit2
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/Source/WebKit2/ChangeLog

    r179904 r179909  
     12015-02-10  Conrad Shultz  <conrad_shultz@apple.com>
     2
     3        Clients need the ability to hook into immediate action lifecycle
     4        https://bugs.webkit.org/show_bug.cgi?id=141449
     5
     6        Reviewed by Tim Horton.
     7
     8        * UIProcess/API/Cocoa/WKViewPrivate.h:
     9        Expose new methods.
     10
     11        * UIProcess/API/mac/WKView.mm:
     12        (-[WKView _prepareForImmediateActionAnimation]):
     13        (-[WKView _cancelImmediateActionAnimation]):
     14        (-[WKView _completeImmediateActionAnimation]):
     15        Stub implementations.
     16
     17        * UIProcess/mac/WKImmediateActionController.mm:
     18        (-[WKImmediateActionController immediateActionRecognizerWillPrepare:]):
     19        Send -_prepareForImmediateActionAnimation.
     20        (-[WKImmediateActionController immediateActionRecognizerDidCancelAnimation:]):
     21        Send -_cancelImmediateActionAnimation.
     22        (-[WKImmediateActionController immediateActionRecognizerDidCompleteAnimation:]):
     23        Send -_completeImmediateActionAnimation.
     24
    1252015-02-10  Dan Bernstein  <mitz@apple.com>
    226
  • trunk/Source/WebKit2/UIProcess/API/Cocoa/WKViewPrivate.h

    r179752 r179909  
    135135- (id)_immediateActionAnimationControllerForHitTestResult:(WKHitTestResultRef)hitTestResult withType:(_WKImmediateActionType)type userData:(WKTypeRef)userData;
    136136
     137- (void)_prepareForImmediateActionAnimation;
     138- (void)_cancelImmediateActionAnimation;
     139- (void)_completeImmediateActionAnimation;
     140
    137141- (void)_dismissContentRelativeChildWindows;
    138142#endif
  • trunk/Source/WebKit2/UIProcess/API/mac/WKView.mm

    r179752 r179909  
    43594359}
    43604360
     4361- (void)_prepareForImmediateActionAnimation
     4362{
     4363}
     4364
     4365- (void)_cancelImmediateActionAnimation
     4366{
     4367}
     4368
     4369- (void)_completeImmediateActionAnimation
     4370{
     4371}
     4372
    43614373- (void)_dismissContentRelativeChildWindows
    43624374{
  • trunk/Source/WebKit2/UIProcess/mac/WKImmediateActionController.mm

    r179809 r179909  
    161161        return;
    162162
     163    [_wkView _prepareForImmediateActionAnimation];
     164
    163165    [_wkView _dismissContentRelativeChildWindows];
    164166
     
    208210        return;
    209211
     212    [_wkView _cancelImmediateActionAnimation];
     213
    210214    _page->setTextIndicatorAnimationProgress(0);
    211215    [self _clearImmediateActionState];
     
    217221    if (immediateActionRecognizer != _immediateActionRecognizer)
    218222        return;
     223
     224    [_wkView _completeImmediateActionAnimation];
    219225
    220226    _page->setTextIndicatorAnimationProgress(1);
Note: See TracChangeset for help on using the changeset viewer.