Changeset 179909 in webkit
- Timestamp:
- Feb 10, 2015 6:08:49 PM (9 years ago)
- Location:
- trunk/Source/WebKit2
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebKit2/ChangeLog
r179904 r179909 1 2015-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 1 25 2015-02-10 Dan Bernstein <mitz@apple.com> 2 26 -
trunk/Source/WebKit2/UIProcess/API/Cocoa/WKViewPrivate.h
r179752 r179909 135 135 - (id)_immediateActionAnimationControllerForHitTestResult:(WKHitTestResultRef)hitTestResult withType:(_WKImmediateActionType)type userData:(WKTypeRef)userData; 136 136 137 - (void)_prepareForImmediateActionAnimation; 138 - (void)_cancelImmediateActionAnimation; 139 - (void)_completeImmediateActionAnimation; 140 137 141 - (void)_dismissContentRelativeChildWindows; 138 142 #endif -
trunk/Source/WebKit2/UIProcess/API/mac/WKView.mm
r179752 r179909 4359 4359 } 4360 4360 4361 - (void)_prepareForImmediateActionAnimation 4362 { 4363 } 4364 4365 - (void)_cancelImmediateActionAnimation 4366 { 4367 } 4368 4369 - (void)_completeImmediateActionAnimation 4370 { 4371 } 4372 4361 4373 - (void)_dismissContentRelativeChildWindows 4362 4374 { -
trunk/Source/WebKit2/UIProcess/mac/WKImmediateActionController.mm
r179809 r179909 161 161 return; 162 162 163 [_wkView _prepareForImmediateActionAnimation]; 164 163 165 [_wkView _dismissContentRelativeChildWindows]; 164 166 … … 208 210 return; 209 211 212 [_wkView _cancelImmediateActionAnimation]; 213 210 214 _page->setTextIndicatorAnimationProgress(0); 211 215 [self _clearImmediateActionState]; … … 217 221 if (immediateActionRecognizer != _immediateActionRecognizer) 218 222 return; 223 224 [_wkView _completeImmediateActionAnimation]; 219 225 220 226 _page->setTextIndicatorAnimationProgress(1);
Note: See TracChangeset
for help on using the changeset viewer.