<!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>[165081] 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/165081">165081</a></dd>
<dt>Author</dt> <dd>enrica@apple.com</dd>
<dt>Date</dt> <dd>2014-03-04 14:52:56 -0800 (Tue, 04 Mar 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[iOS WebKit2]: Next/Prev button in the accessory bar do not work.
https://bugs.webkit.org/show_bug.cgi?id=129690
<rdar://problem/16073569>
Reviewed by Simon Fraser.
Adding support for Next and Previous buttons in the accessory bar.
When the request is processed by the WebProcess, we identify the next
focusable node that needs to be assisted and we call focus() on the element
letting the focus changing machinery take care of updating the assisted node.
This change also add support for the Clear button, when appropriate and hooks up
the call to the WebProcess.
* UIProcess/WebPageProxy.h:
* UIProcess/ios/WKContentViewInteraction.mm:
(-[WKContentView accessoryTab:]):
(-[WKContentView accessoryClear]):
(-[WKContentView _updateAccessory]):
* UIProcess/ios/WebPageProxyIOS.mm:
(WebKit::WebPageProxy::focusNextAssistedNode):
* WebProcess/WebPage/WebPage.h:
* WebProcess/WebPage/WebPage.messages.in:
* WebProcess/WebPage/ios/WebPageIOS.mm:
(WebKit::nextFocusableElement):
(WebKit::hasFocusableElement):
(WebKit::WebPage::focusNextAssistedNode):
(WebKit::WebPage::getAssistedNodeInformation):</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 (165080 => 165081)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-03-04 22:48:30 UTC (rev 165080)
+++ trunk/Source/WebKit2/ChangeLog 2014-03-04 22:52:56 UTC (rev 165081)
</span><span class="lines">@@ -1,3 +1,33 @@
</span><ins>+2014-03-04 Enrica Casucci <enrica@apple.com>
+
+ [iOS WebKit2]: Next/Prev button in the accessory bar do not work.
+ https://bugs.webkit.org/show_bug.cgi?id=129690
+ <rdar://problem/16073569>
+
+ Reviewed by Simon Fraser.
+
+ Adding support for Next and Previous buttons in the accessory bar.
+ When the request is processed by the WebProcess, we identify the next
+ focusable node that needs to be assisted and we call focus() on the element
+ letting the focus changing machinery take care of updating the assisted node.
+ This change also add support for the Clear button, when appropriate and hooks up
+ the call to the WebProcess.
+
+ * UIProcess/WebPageProxy.h:
+ * UIProcess/ios/WKContentViewInteraction.mm:
+ (-[WKContentView accessoryTab:]):
+ (-[WKContentView accessoryClear]):
+ (-[WKContentView _updateAccessory]):
+ * UIProcess/ios/WebPageProxyIOS.mm:
+ (WebKit::WebPageProxy::focusNextAssistedNode):
+ * WebProcess/WebPage/WebPage.h:
+ * WebProcess/WebPage/WebPage.messages.in:
+ * WebProcess/WebPage/ios/WebPageIOS.mm:
+ (WebKit::nextFocusableElement):
+ (WebKit::hasFocusableElement):
+ (WebKit::WebPage::focusNextAssistedNode):
+ (WebKit::WebPage::getAssistedNodeInformation):
+
</ins><span class="cx"> 2014-03-04 Simon Fraser <simon.fraser@apple.com>
</span><span class="cx">
</span><span class="cx"> Allow iOS DumpRenderTree crashes to show application-specific information
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebPageProxyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.h (165080 => 165081)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebPageProxy.h 2014-03-04 22:48:30 UTC (rev 165080)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.h 2014-03-04 22:52:56 UTC (rev 165081)
</span><span class="lines">@@ -480,6 +480,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><ins>+ void focusNextAssistedNode(bool isForward);
</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 (165080 => 165081)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm 2014-03-04 22:48:30 UTC (rev 165080)
+++ trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm 2014-03-04 22:52:56 UTC (rev 165081)
</span><span class="lines">@@ -1287,6 +1287,7 @@
</span><span class="cx">
</span><span class="cx"> - (void)accessoryTab:(BOOL)isNext
</span><span class="cx"> {
</span><ins>+ _page->focusNextAssistedNode(isNext);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (void)accessoryAutoFill
</span><span class="lines">@@ -1295,15 +1296,30 @@
</span><span class="cx">
</span><span class="cx"> - (void)accessoryClear
</span><span class="cx"> {
</span><ins>+ _page->setAssistedNodeValue(String());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (void)_updateAccessory
</span><span class="cx"> {
</span><span class="cx"> [_formAccessoryView setNextEnabled:_assistedNodeInformation.hasNextNode];
</span><span class="cx"> [_formAccessoryView setPreviousEnabled:_assistedNodeInformation.hasPreviousNode];
</span><del>-
- [_formAccessoryView setClearVisible:NO];
</del><span class="cx">
</span><ins>+ if (UICurrentUserInterfaceIdiomIsPad())
+ [_formAccessoryView setClearVisible:NO];
+ else {
+ switch (_assistedNodeInformation.elementType) {
+ case WebKit::WKTypeDate:
+ case WebKit::WKTypeMonth:
+ case WebKit::WKTypeDateTimeLocal:
+ case WebKit::WKTypeTime:
+ [_formAccessoryView setClearVisible:YES];
+ break;
+ default:
+ [_formAccessoryView setClearVisible:NO];
+ break;
+ }
+ }
+
</ins><span class="cx"> // FIXME: hide or show the AutoFill button as needed.
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessiosWebPageProxyIOSmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/ios/WebPageProxyIOS.mm (165080 => 165081)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/ios/WebPageProxyIOS.mm 2014-03-04 22:48:30 UTC (rev 165080)
+++ trunk/Source/WebKit2/UIProcess/ios/WebPageProxyIOS.mm 2014-03-04 22:52:56 UTC (rev 165081)
</span><span class="lines">@@ -510,6 +510,11 @@
</span><span class="cx"> m_pageClient.stopAssistingNode();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void WebPageProxy::focusNextAssistedNode(bool isForward)
+{
+ process().send(Messages::WebPage::FocusNextAssistedNode(isForward), m_pageID);
+}
+
</ins><span class="cx"> void WebPageProxy::setAssistedNodeValue(const String& value)
</span><span class="cx"> {
</span><span class="cx"> process().send(Messages::WebPage::SetAssistedNodeValue(value), m_pageID);
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageWebPageh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h (165080 => 165081)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h 2014-03-04 22:48:30 UTC (rev 165080)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h 2014-03-04 22:52:56 UTC (rev 165081)
</span><span class="lines">@@ -466,6 +466,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><ins>+ void focusNextAssistedNode(bool isForward);
</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 (165080 => 165081)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.messages.in 2014-03-04 22:48:30 UTC (rev 165080)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.messages.in 2014-03-04 22:52:56 UTC (rev 165081)
</span><span class="lines">@@ -64,6 +64,7 @@
</span><span class="cx"> StartInteractionWithElementAtPosition(WebCore::IntPoint point)
</span><span class="cx"> StopInteraction()
</span><span class="cx"> PerformActionOnElement(uint32_t action)
</span><ins>+ FocusNextAssistedNode(bool isForward)
</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 (165080 => 165081)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm 2014-03-04 22:48:30 UTC (rev 165080)
+++ trunk/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm 2014-03-04 22:52:56 UTC (rev 165081)
</span><span class="lines">@@ -1568,26 +1568,38 @@
</span><span class="cx"> return node->isContentEditable();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static inline bool hasFocusableNode(Node* startNode, Page* page, bool isForward)
</del><ins>+static inline Element* nextFocusableElement(Node* startNode, Page* page, bool isForward)
</ins><span class="cx"> {
</span><span class="cx"> RefPtr<KeyboardEvent> key = KeyboardEvent::create();
</span><span class="cx">
</span><del>- Node* nextNode = startNode;
</del><ins>+ Element* nextElement = toElement(startNode);
</ins><span class="cx"> do {
</span><del>- nextNode = isForward ? page->focusController().nextFocusableElement(FocusNavigationScope::focusNavigationScopeOf(&nextNode->document()), nextNode, key.get())
- : page->focusController().previousFocusableElement(FocusNavigationScope::focusNavigationScopeOf(&nextNode->document()), nextNode, key.get());
- } while (nextNode && !isAssistableNode(nextNode));
</del><ins>+ nextElement = isForward ? page->focusController().nextFocusableElement(FocusNavigationScope::focusNavigationScopeOf(&nextElement->document()), nextElement, key.get())
+ : page->focusController().previousFocusableElement(FocusNavigationScope::focusNavigationScopeOf(&nextElement->document()), nextElement, key.get());
+ } while (nextElement && !isAssistableNode(nextElement));
</ins><span class="cx">
</span><del>- return nextNode;
</del><ins>+ return nextElement;
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+static inline bool hasFocusableElement(Node* startNode, Page* page, bool isForward)
+{
+ return nextFocusableElement(startNode, page, isForward) != nil;
+}
+
+void WebPage::focusNextAssistedNode(bool isForward)
+{
+ Element* nextElement = nextFocusableElement(m_assistedNode.get(), m_page.get(), isForward);
+ if (nextElement)
+ nextElement->focus();
+}
+
</ins><span class="cx"> void WebPage::getAssistedNodeInformation(AssistedNodeInformation& information)
</span><span class="cx"> {
</span><span class="cx"> information.elementRect = m_page->focusController().focusedOrMainFrame().view()->contentsToRootView(m_assistedNode->renderer()->absoluteBoundingBoxRect());
</span><span class="cx"> information.minimumScaleFactor = m_viewportConfiguration.minimumScale();
</span><span class="cx"> information.maximumScaleFactor = m_viewportConfiguration.maximumScale();
</span><del>- information.hasNextNode = hasFocusableNode(m_assistedNode.get(), m_page.get(), true);
- information.hasPreviousNode = hasFocusableNode(m_assistedNode.get(), m_page.get(), false);
</del><ins>+ information.hasNextNode = hasFocusableElement(m_assistedNode.get(), m_page.get(), true);
+ information.hasPreviousNode = hasFocusableElement(m_assistedNode.get(), m_page.get(), false);
</ins><span class="cx">
</span><span class="cx"> if (isHTMLSelectElement(m_assistedNode.get())) {
</span><span class="cx"> HTMLSelectElement* element = toHTMLSelectElement(m_assistedNode.get());
</span></span></pre>
</div>
</div>
</body>
</html>