<!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>[177246] 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/177246">177246</a></dd>
<dt>Author</dt> <dd>enrica@apple.com</dd>
<dt>Date</dt> <dd>2014-12-12 16:00:32 -0800 (Fri, 12 Dec 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[iOS] Predictions are not updated when using navigation buttons.
https://bugs.webkit.org/show_bug.cgi?id=139567
rdar://problem/19132585
Reviewed by Dan Bernstein.
When moving focus programmatically, we need to notify the keyboard so that it
can update the prediction bar.
* UIProcess/WebPageProxy.h:
* UIProcess/ios/WKContentViewInteraction.mm:
(-[WKFormInputSession setAccessoryViewCustomButtonTitle:]):
(-[WKContentView requiresAccessoryView]):
(-[WKContentView inputAssistantButtonItems]):
(-[WKContentView accessoryTab:]):
(-[WKContentView _startAssistingKeyboard]):
(-[WKContentView _stopAssistingNode]):
* UIProcess/ios/WebPageProxyIOS.mm:
(WebKit::WebPageProxy::focusNextAssistedNode):
* WebProcess/WebPage/WebPage.h:
* WebProcess/WebPage/WebPage.messages.in:
* WebProcess/WebPage/ios/WebPageIOS.mm:
(WebKit::WebPage::focusNextAssistedNode):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebPageProxyh">trunk/Source/WebKit2/UIProcess/WebPageProxy.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessiosWKContentViewInteractionmm">trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessiosWebPageProxyIOSmm">trunk/Source/WebKit2/UIProcess/ios/WebPageProxyIOS.mm</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageWebPageh">trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageWebPagemessagesin">trunk/Source/WebKit2/WebProcess/WebPage/WebPage.messages.in</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageiosWebPageIOSmm">trunk/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (177245 => 177246)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-12-12 23:46:13 UTC (rev 177245)
+++ trunk/Source/WebKit2/ChangeLog 2014-12-13 00:00:32 UTC (rev 177246)
</span><span class="lines">@@ -1,3 +1,29 @@
</span><ins>+2014-12-12 Enrica Casucci <enrica@apple.com>
+
+ [iOS] Predictions are not updated when using navigation buttons.
+ https://bugs.webkit.org/show_bug.cgi?id=139567
+ rdar://problem/19132585
+
+ Reviewed by Dan Bernstein.
+
+ When moving focus programmatically, we need to notify the keyboard so that it
+ can update the prediction bar.
+
+ * UIProcess/WebPageProxy.h:
+ * UIProcess/ios/WKContentViewInteraction.mm:
+ (-[WKFormInputSession setAccessoryViewCustomButtonTitle:]):
+ (-[WKContentView requiresAccessoryView]):
+ (-[WKContentView inputAssistantButtonItems]):
+ (-[WKContentView accessoryTab:]):
+ (-[WKContentView _startAssistingKeyboard]):
+ (-[WKContentView _stopAssistingNode]):
+ * UIProcess/ios/WebPageProxyIOS.mm:
+ (WebKit::WebPageProxy::focusNextAssistedNode):
+ * WebProcess/WebPage/WebPage.h:
+ * WebProcess/WebPage/WebPage.messages.in:
+ * WebProcess/WebPage/ios/WebPageIOS.mm:
+ (WebKit::WebPage::focusNextAssistedNode):
+
</ins><span class="cx"> 2014-12-12 Timothy Horton <timothy_horton@apple.com>
</span><span class="cx">
</span><span class="cx"> TextIndicator (and other view-relative subwindows) is not dismissed on zoom gesture
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebPageProxyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.h (177245 => 177246)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebPageProxy.h 2014-12-12 23:46:13 UTC (rev 177245)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.h 2014-12-13 00:00:32 UTC (rev 177246)
</span><span class="lines">@@ -450,7 +450,7 @@
</span><span class="cx"> void performActionOnElement(uint32_t action);
</span><span class="cx"> void saveImageToLibrary(const SharedMemory::Handle& imageHandle, uint64_t imageSize);
</span><span class="cx"> void didUpdateBlockSelectionWithTouch(uint32_t touch, uint32_t flags, float growThreshold, float shrinkThreshold);
</span><del>- void focusNextAssistedNode(bool isForward);
</del><ins>+ void focusNextAssistedNode(bool isForward, std::function<void (CallbackBase::Error)>);
</ins><span class="cx"> void setAssistedNodeValue(const String&);
</span><span class="cx"> void setAssistedNodeValueAsNumber(double);
</span><span class="cx"> void setAssistedNodeSelectedIndex(uint32_t index, bool allowMultipleSelection = false);
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessiosWKContentViewInteractionmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm (177245 => 177246)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm 2014-12-12 23:46:13 UTC (rev 177245)
+++ trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm 2014-12-13 00:00:32 UTC (rev 177246)
</span><span class="lines">@@ -149,6 +149,10 @@
</span><span class="cx"> + (BOOL)_addCompletion:(void(^)(BOOL))completion;
</span><span class="cx"> @end
</span><span class="cx">
</span><ins>+@interface UIWebFormAccessory (StagingToRemove)
+@property(nonatomic,retain) NSArray *buttonItems;
+@end
+
</ins><span class="cx"> @interface WKFormInputSession : NSObject <_WKFormInputSession>
</span><span class="cx">
</span><span class="cx"> - (instancetype)initWithContentView:(WKContentView *)view userObject:(NSObject <NSSecureCoding> *)userObject;
</span><span class="lines">@@ -193,6 +197,8 @@
</span><span class="cx"> [[_contentView formAccessoryView] showAutoFillButtonWithTitle:title];
</span><span class="cx"> else
</span><span class="cx"> [[_contentView formAccessoryView] hideAutoFillButton];
</span><ins>+ if (UICurrentUserInterfaceIdiomIsPad())
+ [_contentView reloadInputViews];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (void)invalidate
</span><span class="lines">@@ -1144,10 +1150,10 @@
</span><span class="cx"> case InputType::Phone:
</span><span class="cx"> case InputType::Number:
</span><span class="cx"> case InputType::NumberPad:
</span><del>- return YES;
</del><ins>+ return !UICurrentUserInterfaceIdiomIsPad();
</ins><span class="cx"> case InputType::ContentEditable:
</span><span class="cx"> case InputType::TextArea:
</span><del>- return YES;
</del><ins>+ return !UICurrentUserInterfaceIdiomIsPad();
</ins><span class="cx"> case InputType::Select:
</span><span class="cx"> case InputType::Date:
</span><span class="cx"> case InputType::DateTime:
</span><span class="lines">@@ -1172,6 +1178,15 @@
</span><span class="cx"> return _formAccessoryView.get();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+- (NSArray *)inputAssistantButtonItems
+{
+ if (!_formAccessoryView) {
+ _formAccessoryView = adoptNS([[UIWebFormAccessory alloc] init]);
+ [_formAccessoryView setDelegate:self];
+ }
+ return ([_formAccessoryView respondsToSelector:@selector(buttonItems)]) ? [_formAccessoryView buttonItems] : nil;
+}
+
</ins><span class="cx"> - (NSArray *)supportedPasteboardTypesForCurrentSelection
</span><span class="cx"> {
</span><span class="cx"> if (_page->editorState().selectionIsNone)
</span><span class="lines">@@ -1967,7 +1982,12 @@
</span><span class="cx"> _inputPeripheral = nil;
</span><span class="cx">
</span><span class="cx"> _didAccessoryTabInitiateFocus = YES; // Will be cleared in either -_displayFormNodeInputView or -cleanupInteraction.
</span><del>- _page->focusNextAssistedNode(isNext);
</del><ins>+ [self beginSelectionChange];
+ _page->focusNextAssistedNode(isNext, [self](CallbackBase::Error) {
+ [self endSelectionChange];
+ [self reloadInputViews];
+ });
+
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (void)accessoryAutoFill
</span><span class="lines">@@ -2634,6 +2654,7 @@
</span><span class="cx"> - (void)_startAssistingKeyboard
</span><span class="cx"> {
</span><span class="cx"> [self useSelectionAssistantWithMode:UIWebSelectionModeTextOnly];
</span><ins>+ [self reloadInputViews];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (void)_stopAssistingKeyboard
</span><span class="lines">@@ -2715,6 +2736,7 @@
</span><span class="cx"> _inputPeripheral = nil;
</span><span class="cx">
</span><span class="cx"> [self _stopAssistingKeyboard];
</span><ins>+ [_formAccessoryView hideAutoFillButton];
</ins><span class="cx"> [self reloadInputViews];
</span><span class="cx"> [self _updateAccessory];
</span><span class="cx"> // The name is misleading, but this actually clears the selection views and removes any selection.
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessiosWebPageProxyIOSmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/ios/WebPageProxyIOS.mm (177245 => 177246)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/ios/WebPageProxyIOS.mm 2014-12-12 23:46:13 UTC (rev 177245)
+++ trunk/Source/WebKit2/UIProcess/ios/WebPageProxyIOS.mm 2014-12-13 00:00:32 UTC (rev 177246)
</span><span class="lines">@@ -800,9 +800,15 @@
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-void WebPageProxy::focusNextAssistedNode(bool isForward)
</del><ins>+void WebPageProxy::focusNextAssistedNode(bool isForward, std::function<void (CallbackBase::Error)> callbackFunction)
</ins><span class="cx"> {
</span><del>- process().send(Messages::WebPage::FocusNextAssistedNode(isForward), m_pageID);
</del><ins>+ if (!isValid()) {
+ callbackFunction(CallbackBase::Error::Unknown);
+ return;
+ }
+
+ uint64_t callbackID = m_callbacks.put(WTF::move(callbackFunction), std::make_unique<ProcessThrottler::BackgroundActivityToken>(m_process->throttler()));
+ process().send(Messages::WebPage::FocusNextAssistedNode(isForward, callbackID), m_pageID);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebPageProxy::setAssistedNodeValue(const String& value)
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageWebPageh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h (177245 => 177246)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h 2014-12-12 23:46:13 UTC (rev 177245)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h 2014-12-13 00:00:32 UTC (rev 177246)
</span><span class="lines">@@ -511,7 +511,7 @@
</span><span class="cx"> void startInteractionWithElementAtPosition(const WebCore::IntPoint&);
</span><span class="cx"> void stopInteraction();
</span><span class="cx"> void performActionOnElement(uint32_t action);
</span><del>- void focusNextAssistedNode(bool isForward);
</del><ins>+ void focusNextAssistedNode(bool isForward, uint64_t callbackID);
</ins><span class="cx"> void setAssistedNodeValue(const String&);
</span><span class="cx"> void setAssistedNodeValueAsNumber(double);
</span><span class="cx"> void setAssistedNodeSelectedIndex(uint32_t index, bool allowMultipleSelection);
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageWebPagemessagesin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.messages.in (177245 => 177246)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.messages.in 2014-12-12 23:46:13 UTC (rev 177245)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.messages.in 2014-12-13 00:00:32 UTC (rev 177246)
</span><span class="lines">@@ -82,7 +82,7 @@
</span><span class="cx"> StartInteractionWithElementAtPosition(WebCore::IntPoint point)
</span><span class="cx"> StopInteraction()
</span><span class="cx"> PerformActionOnElement(uint32_t action)
</span><del>- FocusNextAssistedNode(bool isForward)
</del><ins>+ FocusNextAssistedNode(bool isForward, uint64_t callbackID)
</ins><span class="cx"> SetAssistedNodeValue(String value)
</span><span class="cx"> SetAssistedNodeValueAsNumber(double value)
</span><span class="cx"> SetAssistedNodeSelectedIndex(uint32_t index, bool allowMultipleSelection)
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageiosWebPageIOSmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm (177245 => 177246)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm 2014-12-12 23:46:13 UTC (rev 177245)
+++ trunk/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm 2014-12-13 00:00:32 UTC (rev 177246)
</span><span class="lines">@@ -2125,13 +2125,14 @@
</span><span class="cx"> return nextAssistableElement(startNode, page, isForward);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebPage::focusNextAssistedNode(bool isForward)
</del><ins>+void WebPage::focusNextAssistedNode(bool isForward, uint64_t callbackID)
</ins><span class="cx"> {
</span><span class="cx"> Element* nextElement = nextAssistableElement(m_assistedNode.get(), *m_page, isForward);
</span><span class="cx"> m_userIsInteracting = true;
</span><span class="cx"> if (nextElement)
</span><span class="cx"> nextElement->focus();
</span><span class="cx"> m_userIsInteracting = false;
</span><ins>+ send(Messages::WebPageProxy::VoidCallback(callbackID));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebPage::getAssistedNodeInformation(AssistedNodeInformation& information)
</span></span></pre>
</div>
</div>
</body>
</html>