Title: [179909] trunk/Source/WebKit2
- Revision
- 179909
- Author
- [email protected]
- Date
- 2015-02-10 18:08:49 -0800 (Tue, 10 Feb 2015)
Log 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.
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (179908 => 179909)
--- trunk/Source/WebKit2/ChangeLog 2015-02-11 01:50:55 UTC (rev 179908)
+++ trunk/Source/WebKit2/ChangeLog 2015-02-11 02:08:49 UTC (rev 179909)
@@ -1,3 +1,27 @@
+2015-02-10 Conrad Shultz <[email protected]>
+
+ 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.
+
2015-02-10 Dan Bernstein <[email protected]>
<rdar://problem/19770264> Starting a navigation gesture dismisses the keyboard
Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKViewPrivate.h (179908 => 179909)
--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKViewPrivate.h 2015-02-11 01:50:55 UTC (rev 179908)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKViewPrivate.h 2015-02-11 02:08:49 UTC (rev 179909)
@@ -134,6 +134,10 @@
// do something custom, return an object that conforms to the NSImmediateActionAnimationController protocol.
- (id)_immediateActionAnimationControllerForHitTestResult:(WKHitTestResultRef)hitTestResult withType:(_WKImmediateActionType)type userData:(WKTypeRef)userData;
+- (void)_prepareForImmediateActionAnimation;
+- (void)_cancelImmediateActionAnimation;
+- (void)_completeImmediateActionAnimation;
+
- (void)_dismissContentRelativeChildWindows;
#endif
Modified: trunk/Source/WebKit2/UIProcess/API/mac/WKView.mm (179908 => 179909)
--- trunk/Source/WebKit2/UIProcess/API/mac/WKView.mm 2015-02-11 01:50:55 UTC (rev 179908)
+++ trunk/Source/WebKit2/UIProcess/API/mac/WKView.mm 2015-02-11 02:08:49 UTC (rev 179909)
@@ -4358,6 +4358,18 @@
return nil;
}
+- (void)_prepareForImmediateActionAnimation
+{
+}
+
+- (void)_cancelImmediateActionAnimation
+{
+}
+
+- (void)_completeImmediateActionAnimation
+{
+}
+
- (void)_dismissContentRelativeChildWindows
{
// FIXME: We don't know which panel we are dismissing, it may not even be in the current page (see <rdar://problem/13875766>).
Modified: trunk/Source/WebKit2/UIProcess/mac/WKImmediateActionController.mm (179908 => 179909)
--- trunk/Source/WebKit2/UIProcess/mac/WKImmediateActionController.mm 2015-02-11 01:50:55 UTC (rev 179908)
+++ trunk/Source/WebKit2/UIProcess/mac/WKImmediateActionController.mm 2015-02-11 02:08:49 UTC (rev 179909)
@@ -160,6 +160,8 @@
if (immediateActionRecognizer != _immediateActionRecognizer)
return;
+ [_wkView _prepareForImmediateActionAnimation];
+
[_wkView _dismissContentRelativeChildWindows];
_page->setMaintainsInactiveSelection(true);
@@ -207,6 +209,8 @@
if (immediateActionRecognizer != _immediateActionRecognizer)
return;
+ [_wkView _cancelImmediateActionAnimation];
+
_page->setTextIndicatorAnimationProgress(0);
[self _clearImmediateActionState];
_page->setMaintainsInactiveSelection(false);
@@ -217,6 +221,8 @@
if (immediateActionRecognizer != _immediateActionRecognizer)
return;
+ [_wkView _completeImmediateActionAnimation];
+
_page->setTextIndicatorAnimationProgress(1);
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
