Title: [186977] trunk/Source/WebKit2
- Revision
- 186977
- Author
- [email protected]
- Date
- 2015-07-17 16:59:12 -0700 (Fri, 17 Jul 2015)
Log Message
[iOS] Implement selectionInteractionAssistant accessor.
https://bugs.webkit.org/show_bug.cgi?id=147054
rdar://problem/20864286
Reviewed by Tim Horton.
One more change to adopt the new selection interaction
model on iOS.
* UIProcess/ios/WKContentViewInteraction.mm:
(-[WKContentView selectionInteractionAssistant]):
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (186976 => 186977)
--- trunk/Source/WebKit2/ChangeLog 2015-07-17 23:55:59 UTC (rev 186976)
+++ trunk/Source/WebKit2/ChangeLog 2015-07-17 23:59:12 UTC (rev 186977)
@@ -1,3 +1,17 @@
+2015-07-17 Enrica Casucci <[email protected]>
+
+ [iOS] Implement selectionInteractionAssistant accessor.
+ https://bugs.webkit.org/show_bug.cgi?id=147054
+ rdar://problem/20864286
+
+ Reviewed by Tim Horton.
+
+ One more change to adopt the new selection interaction
+ model on iOS.
+
+ * UIProcess/ios/WKContentViewInteraction.mm:
+ (-[WKContentView selectionInteractionAssistant]):
+
2015-07-17 Dan Bernstein <[email protected]>
REGRESSION (r186964): Crash in WebKit2.CloseFromWithinCreatePage
Modified: trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm (186976 => 186977)
--- trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm 2015-07-17 23:55:59 UTC (rev 186976)
+++ trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm 2015-07-17 23:59:12 UTC (rev 186977)
@@ -218,6 +218,8 @@
@interface UIWebFormAccessory (StagingToRemove)
- (id)initWithInputAssistantItem:(UITextInputAssistantItem *)inputAssistantItem;
@end
+
+@protocol UISelectionInteractionAssistant;
#endif
@interface WKFormInputSession : NSObject <_WKFormInputSession>
@@ -2544,6 +2546,14 @@
return _webSelectionAssistant.get();
}
+#if __IPHONE_OS_VERSION_MIN_REQUIRED >= 90000
+- (id<UISelectionInteractionAssistant>)selectionInteractionAssistant
+{
+ if ([_webSelectionAssistant conformsToProtocol:@protocol(UISelectionInteractionAssistant)])
+ return (id<UISelectionInteractionAssistant>)_webSelectionAssistant.get();
+ return nil;
+}
+#endif
// NSRange support. Would like to deprecate to the extent possible, although some support
// (i.e. selectionRange) has shipped as API.
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
