<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[198046] trunk/Source/WebKit2</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/198046">198046</a></dd>
<dt>Author</dt> <dd>mitz@apple.com</dd>
<dt>Date</dt> <dd>2016-03-11 14:13:42 -0800 (Fri, 11 Mar 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>[iOS] Allow clients to specify text suggestions to be used for a form input session
https://bugs.webkit.org/show_bug.cgi?id=155343
Patch by Chelsea Pugh <cpugh@apple.com> on 2016-03-11
Reviewed by Dan Bernstein.
* UIProcess/API/Cocoa/_WKFormInputSession.h:
* UIProcess/API/Cocoa/_WKInputDelegate.h:
* UIProcess/ios/WKContentViewInteraction.mm:
(-[WKFormInputSession suggestions]): Add a getter for suggestions.
(-[WKFormInputSession setSuggestions:]): Add a setter, which calls setSuggestions with our suggestions on the input delegate.
(-[WKContentView insertTextSuggestion:]): Call _webView:insertTextSuggestion:inInputSession: on our input delegate so clients know
a text suggestion was tapped.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICocoa_WKFormInputSessionh">trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKFormInputSession.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICocoa_WKInputDelegateh">trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKInputDelegate.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessiosWKContentViewInteractionmm">trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (198045 => 198046)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2016-03-11 21:53:34 UTC (rev 198045)
+++ trunk/Source/WebKit2/ChangeLog 2016-03-11 22:13:42 UTC (rev 198046)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2016-03-11 Chelsea Pugh <cpugh@apple.com>
+
+ [iOS] Allow clients to specify text suggestions to be used for a form input session
+ https://bugs.webkit.org/show_bug.cgi?id=155343
+
+ Reviewed by Dan Bernstein.
+
+ * UIProcess/API/Cocoa/_WKFormInputSession.h:
+ * UIProcess/API/Cocoa/_WKInputDelegate.h:
+ * UIProcess/ios/WKContentViewInteraction.mm:
+ (-[WKFormInputSession suggestions]): Add a getter for suggestions.
+ (-[WKFormInputSession setSuggestions:]): Add a setter, which calls setSuggestions with our suggestions on the input delegate.
+ (-[WKContentView insertTextSuggestion:]): Call _webView:insertTextSuggestion:inInputSession: on our input delegate so clients know
+ a text suggestion was tapped.
+
</ins><span class="cx"> 2016-03-11 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><span class="cx"> Creating and releasing a WKBackForwardListItem crashes
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoa_WKFormInputSessionh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKFormInputSession.h (198045 => 198046)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKFormInputSession.h 2016-03-11 21:53:34 UTC (rev 198045)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKFormInputSession.h 2016-03-11 22:13:42 UTC (rev 198046)
</span><span class="lines">@@ -30,6 +30,8 @@
</span><span class="cx"> #import <Foundation/Foundation.h>
</span><span class="cx"> #import <WebKit/_WKFocusedElementInfo.h>
</span><span class="cx">
</span><ins>+@class UITextSuggestion;
+
</ins><span class="cx"> @protocol _WKFormInputSession <NSObject>
</span><span class="cx">
</span><span class="cx"> @property (nonatomic, readonly, getter=isValid) BOOL valid;
</span><span class="lines">@@ -39,6 +41,7 @@
</span><span class="cx"> #if TARGET_OS_IPHONE
</span><span class="cx"> @property (nonatomic, copy) NSString *accessoryViewCustomButtonTitle;
</span><span class="cx"> @property (nonatomic, strong) UIView *customInputView WK_AVAILABLE(NA, WK_IOS_TBA);
</span><ins>+@property (nonatomic, copy) NSArray<UITextSuggestion *> *suggestions WK_AVAILABLE(NA, WK_IOS_TBA);
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> @end
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoa_WKInputDelegateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKInputDelegate.h (198045 => 198046)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKInputDelegate.h 2016-03-11 21:53:34 UTC (rev 198045)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKInputDelegate.h 2016-03-11 22:13:42 UTC (rev 198046)
</span><span class="lines">@@ -29,6 +29,7 @@
</span><span class="cx">
</span><span class="cx"> #import <Foundation/Foundation.h>
</span><span class="cx">
</span><ins>+@class UITextSuggestion;
</ins><span class="cx"> @class WKWebView;
</span><span class="cx"> @protocol _WKFocusedElementInfo;
</span><span class="cx"> @protocol _WKFormInputSession;
</span><span class="lines">@@ -45,6 +46,7 @@
</span><span class="cx"> - (void)_webView:(WKWebView *)webView accessoryViewCustomButtonTappedInFormInputSession:(id <_WKFormInputSession>)inputSession;
</span><span class="cx"> - (BOOL)_webView:(WKWebView *)webView hasSuggestionsForCurrentStringInInputSession:(id <_WKFormInputSession>)inputSession;
</span><span class="cx"> - (NSArray *)_webView:(WKWebView *)webView suggestionsForString:(NSString *)string inInputSession:(id <_WKFormInputSession>)inputSession;
</span><ins>+- (void)_webView:(WKWebView *)webView insertTextSuggestion:(UITextSuggestion *)suggestion inInputSession:(id <_WKFormInputSession>)inputSession WK_AVAILABLE(NA, WK_IOS_TBA);
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> @end
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessiosWKContentViewInteractionmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm (198045 => 198046)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm 2016-03-11 21:53:34 UTC (rev 198045)
+++ trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm 2016-03-11 22:13:42 UTC (rev 198046)
</span><span class="lines">@@ -260,6 +260,7 @@
</span><span class="cx"> RetainPtr<NSObject <NSSecureCoding>> _userObject;
</span><span class="cx"> RetainPtr<WKFocusedElementInfo> _focusedElementInfo;
</span><span class="cx"> RetainPtr<UIView> _customInputView;
</span><ins>+ RetainPtr<NSArray<UITextSuggestion *>> _suggestions;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (instancetype)initWithContentView:(WKContentView *)view focusedElementInfo:(WKFocusedElementInfo *)elementInfo userObject:(NSObject <NSSecureCoding> *)userObject
</span><span class="lines">@@ -318,6 +319,24 @@
</span><span class="cx"> [_contentView reloadInputViews];
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+- (NSArray<UITextSuggestion *> *)suggestions
+{
+ return _suggestions.get();
+}
+
+- (void)setSuggestions:(NSArray<UITextSuggestion *> *)suggestions
+{
+#if __IPHONE_OS_VERSION_MIN_REQUIRED >= 100000
+ id <UITextInputSuggestionDelegate> suggestionDelegate = (id <UITextInputSuggestionDelegate>)_contentView.inputDelegate;
+ _suggestions = adoptNS([suggestions copy]);
+ // FIXME 25102224: Remove this dispatch_after once race condition causing keyboard suggestions to overwrite
+ // the suggestions being set is resolved
+ dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(20 * NSEC_PER_MSEC)), dispatch_get_main_queue(), ^{
+ [suggestionDelegate setSuggestions:suggestions];
+ });
+#endif
+}
+
</ins><span class="cx"> - (void)invalidate
</span><span class="cx"> {
</span><span class="cx"> _contentView = nil;
</span><span class="lines">@@ -2603,6 +2622,15 @@
</span><span class="cx"> {
</span><span class="cx"> [self.inputDelegate selectionDidChange:self];
</span><span class="cx"> }
</span><ins>+
+#if __IPHONE_OS_VERSION_MIN_REQUIRED >= 100000
+- (void)insertTextSuggestion:(UITextSuggestion *)textSuggestion
+{
+ id <_WKInputDelegate> inputDelegate = [_webView _inputDelegate];
+ if ([inputDelegate respondsToSelector:@selector(_webView:insertTextSuggestion:inInputSession:)])
+ [inputDelegate _webView:_webView insertTextSuggestion:textSuggestion inInputSession:_formInputSession.get()];
+}
+#endif
</ins><span class="cx">
</span><span class="cx"> - (NSString *)textInRange:(UITextRange *)range
</span><span class="cx"> {
</span></span></pre>
</div>
</div>
</body>
</html>