Title: [187291] branches/safari-601.1-branch/Source/WebKit2
- Revision
- 187291
- Author
- [email protected]
- Date
- 2015-07-23 23:01:33 -0700 (Thu, 23 Jul 2015)
Log Message
Merged r186977. rdar://problem/20864286
Modified Paths
Diff
Modified: branches/safari-601.1-branch/Source/WebKit2/ChangeLog (187290 => 187291)
--- branches/safari-601.1-branch/Source/WebKit2/ChangeLog 2015-07-24 05:58:30 UTC (rev 187290)
+++ branches/safari-601.1-branch/Source/WebKit2/ChangeLog 2015-07-24 06:01:33 UTC (rev 187291)
@@ -1,5 +1,23 @@
2015-07-23 Lucas Forschler <[email protected]>
+ Merge r186977
+
+ 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-23 Lucas Forschler <[email protected]>
+
Merge r186806
2015-07-14 Yongjun Zhang <[email protected]>
Modified: branches/safari-601.1-branch/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm (187290 => 187291)
--- branches/safari-601.1-branch/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm 2015-07-24 05:58:30 UTC (rev 187290)
+++ branches/safari-601.1-branch/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm 2015-07-24 06:01:33 UTC (rev 187291)
@@ -218,6 +218,8 @@
@interface UIWebFormAccessory (StagingToRemove)
- (id)initWithInputAssistantItem:(UITextInputAssistantItem *)inputAssistantItem;
@end
+
+@protocol UISelectionInteractionAssistant;
#endif
@interface WKFormInputSession : NSObject <_WKFormInputSession>
@@ -2534,6 +2536,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
