Title: [187756] trunk/Source/WebKit2
- Revision
- 187756
- Author
- [email protected]
- Date
- 2015-08-03 13:23:36 -0700 (Mon, 03 Aug 2015)
Log Message
[iOS] Link previews sometimes don't hide the link highlight
https://bugs.webkit.org/show_bug.cgi?id=147585
<rdar://problem/22119648>
Reviewed by Beth Dakin.
* UIProcess/ios/WKContentViewInteraction.mm:
(-[WKContentView _interactionStartedFromPreviewItemController:]):
(-[WKContentView _interactionStoppedFromPreviewItemController:]):
(-[WKContentView _previewItemController:didDismissPreview:committing:]):
(-[WKContentView _previewItemController:willPresentPreview:forPosition:inSourceView:]): Deleted.
Use interactionStarted/Stopped, which are always called, instead of didDismiss/willPresent,
which are only called if we return a custom view controller from _presentedViewControllerForPreviewItemController.
We continue using didDismiss to inform clients of dismissal because they'll
only care if they customized the view controller.
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (187755 => 187756)
--- trunk/Source/WebKit2/ChangeLog 2015-08-03 19:54:58 UTC (rev 187755)
+++ trunk/Source/WebKit2/ChangeLog 2015-08-03 20:23:36 UTC (rev 187756)
@@ -1,3 +1,21 @@
+2015-08-03 Tim Horton <[email protected]>
+
+ [iOS] Link previews sometimes don't hide the link highlight
+ https://bugs.webkit.org/show_bug.cgi?id=147585
+ <rdar://problem/22119648>
+
+ Reviewed by Beth Dakin.
+
+ * UIProcess/ios/WKContentViewInteraction.mm:
+ (-[WKContentView _interactionStartedFromPreviewItemController:]):
+ (-[WKContentView _interactionStoppedFromPreviewItemController:]):
+ (-[WKContentView _previewItemController:didDismissPreview:committing:]):
+ (-[WKContentView _previewItemController:willPresentPreview:forPosition:inSourceView:]): Deleted.
+ Use interactionStarted/Stopped, which are always called, instead of didDismiss/willPresent,
+ which are only called if we return a custom view controller from _presentedViewControllerForPreviewItemController.
+ We continue using didDismiss to inform clients of dismissal because they'll
+ only care if they customized the view controller.
+
2015-08-03 Chris Dumez <[email protected]>
[WK2][NetworkCache] Do not munmap() on the main thread
Modified: trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm (187755 => 187756)
--- trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm 2015-08-03 19:54:58 UTC (rev 187755)
+++ trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm 2015-08-03 20:23:36 UTC (rev 187756)
@@ -3361,18 +3361,22 @@
}
-- (void)_previewItemController:(UIPreviewItemController *)controller willPresentPreview:(UIViewController *)viewController forPosition:(CGPoint)position inSourceView:(UIView *)sourceView
+- (void)_interactionStartedFromPreviewItemController:(UIPreviewItemController *)controller
{
[self _removeDefaultGestureRecognizers];
[self _cancelInteraction];
}
-- (void)_previewItemController:(UIPreviewItemController *)controller didDismissPreview:(UIViewController *)viewController committing:(BOOL)committing
+- (void)_interactionStoppedFromPreviewItemController:(UIPreviewItemController *)controller
{
[self _addDefaultGestureRecognizers];
+
_page->stopInteraction();
+}
+- (void)_previewItemController:(UIPreviewItemController *)controller didDismissPreview:(UIViewController *)viewController committing:(BOOL)committing
+{
id<WKUIDelegatePrivate> uiDelegate = static_cast<id <WKUIDelegatePrivate>>([_webView UIDelegate]);
if ([uiDelegate respondsToSelector:@selector(_webView:didDismissPreviewViewController:committing:)])
[uiDelegate _webView:_webView didDismissPreviewViewController:viewController committing:committing];
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
