<!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>[171659] branches/safari-600.1-branch/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/171659">171659</a></dd>
<dt>Author</dt> <dd>matthew_hanson@apple.com</dd>
<dt>Date</dt> <dd>2014-07-27 14:07:24 -0700 (Sun, 27 Jul 2014)</dd>
</dl>

<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/171651">r171651</a>. &lt;rdar://problem/17682120&gt;</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari6001branchSourceWebKit2ChangeLog">branches/safari-600.1-branch/Source/WebKit2/ChangeLog</a></li>
<li><a href="#branchessafari6001branchSourceWebKit2UIProcessWebPageProxyh">branches/safari-600.1-branch/Source/WebKit2/UIProcess/WebPageProxy.h</a></li>
<li><a href="#branchessafari6001branchSourceWebKit2UIProcessiosWKContentViewInteractionmm">branches/safari-600.1-branch/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm</a></li>
<li><a href="#branchessafari6001branchSourceWebKit2UIProcessiosWebPageProxyIOSmm">branches/safari-600.1-branch/Source/WebKit2/UIProcess/ios/WebPageProxyIOS.mm</a></li>
<li><a href="#branchessafari6001branchSourceWebKit2WebProcessWebPageWebPageh">branches/safari-600.1-branch/Source/WebKit2/WebProcess/WebPage/WebPage.h</a></li>
<li><a href="#branchessafari6001branchSourceWebKit2WebProcessWebPageWebPagemessagesin">branches/safari-600.1-branch/Source/WebKit2/WebProcess/WebPage/WebPage.messages.in</a></li>
<li><a href="#branchessafari6001branchSourceWebKit2WebProcessWebPageiosWebPageIOSmm">branches/safari-600.1-branch/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari6001branchSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/Source/WebKit2/ChangeLog (171658 => 171659)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/Source/WebKit2/ChangeLog        2014-07-27 18:45:58 UTC (rev 171658)
+++ branches/safari-600.1-branch/Source/WebKit2/ChangeLog        2014-07-27 21:07:24 UTC (rev 171659)
</span><span class="lines">@@ -1,5 +1,30 @@
</span><span class="cx"> 2014-07-27  Matthew Hanson  &lt;matthew_hanson@apple.com&gt;
</span><span class="cx"> 
</span><ins>+        Merge r171651. &lt;rdar://problem/17682120&gt;
+
+    2014-07-26  Enrica Casucci  &lt;enrica@apple.com&gt;
+    
+            [WebKit2 iOS]Add support for caret movement for the 3rd party keyboard protocol.
+            https://bugs.webkit.org/show_bug.cgi?id=135325
+            &lt;rdar://problem/17682120&gt;
+    
+            Reviewed by Sam Weinig.
+    
+            WKContentView now implements moveByOffset to support the
+            protocol for 3rd party keyboards.
+    
+            * UIProcess/WebPageProxy.h:
+            * UIProcess/ios/WKContentViewInteraction.mm:
+            (-[WKContentView moveByOffset:]):
+            * UIProcess/ios/WebPageProxyIOS.mm:
+            (WebKit::WebPageProxy::moveSelectionByOffset):
+            * WebProcess/WebPage/WebPage.h:
+            * WebProcess/WebPage/WebPage.messages.in:
+            * WebProcess/WebPage/ios/WebPageIOS.mm:
+            (WebKit::WebPage::moveSelectionByOffset):
+    
+2014-07-27  Matthew Hanson  &lt;matthew_hanson@apple.com&gt;
+
</ins><span class="cx">         Merge r171647. &lt;rdar://problem/17315168&gt;
</span><span class="cx"> 
</span><span class="cx">     2014-07-26  Timothy Horton  &lt;timothy_horton@apple.com&gt;
</span></span></pre></div>
<a id="branchessafari6001branchSourceWebKit2UIProcessWebPageProxyh"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/Source/WebKit2/UIProcess/WebPageProxy.h (171658 => 171659)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/Source/WebKit2/UIProcess/WebPageProxy.h        2014-07-27 18:45:58 UTC (rev 171658)
+++ branches/safari-600.1-branch/Source/WebKit2/UIProcess/WebPageProxy.h        2014-07-27 21:07:24 UTC (rev 171659)
</span><span class="lines">@@ -418,6 +418,7 @@
</span><span class="cx">     void updateBlockSelectionWithTouch(const WebCore::IntPoint, uint32_t touch, uint32_t handlePosition);
</span><span class="cx">     void extendSelection(WebCore::TextGranularity);
</span><span class="cx">     void selectWordBackward();
</span><ins>+    void moveSelectionByOffset(int32_t offset, std::function&lt;void (CallbackBase::Error)&gt;);
</ins><span class="cx">     void requestAutocorrectionData(const String&amp; textForAutocorrection, std::function&lt;void (const Vector&lt;WebCore::FloatRect&gt;&amp;, const String&amp;, double, uint64_t, CallbackBase::Error)&gt;);
</span><span class="cx">     void applyAutocorrection(const String&amp; correction, const String&amp; originalText, std::function&lt;void (const String&amp;, CallbackBase::Error)&gt;);
</span><span class="cx">     bool applyAutocorrection(const String&amp; correction, const String&amp; originalText);
</span></span></pre></div>
<a id="branchessafari6001branchSourceWebKit2UIProcessiosWKContentViewInteractionmm"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm (171658 => 171659)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm        2014-07-27 18:45:58 UTC (rev 171658)
+++ branches/safari-600.1-branch/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm        2014-07-27 21:07:24 UTC (rev 171659)
</span><span class="lines">@@ -1697,6 +1697,17 @@
</span><span class="cx">     _page-&gt;updateBlockSelectionWithTouch(WebCore::IntPoint(point), static_cast&lt;uint32_t&gt;(toSelectionTouch(touch)), static_cast&lt;uint32_t&gt;(toSelectionHandlePosition(handle)));
</span><span class="cx"> }
</span><span class="cx"> 
</span><ins>+- (void)moveByOffset:(NSInteger)offset
+{
+    if (!offset)
+        return;
+    
+    [self beginSelectionChange];
+    _page-&gt;moveSelectionByOffset(offset, [self](CallbackBase::Error) {
+        [self endSelectionChange];
+    });
+}
+
</ins><span class="cx"> - (const WKAutoCorrectionData&amp;)autocorrectionData
</span><span class="cx"> {
</span><span class="cx">     return _autocorrectionData;
</span></span></pre></div>
<a id="branchessafari6001branchSourceWebKit2UIProcessiosWebPageProxyIOSmm"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/Source/WebKit2/UIProcess/ios/WebPageProxyIOS.mm (171658 => 171659)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/Source/WebKit2/UIProcess/ios/WebPageProxyIOS.mm        2014-07-27 18:45:58 UTC (rev 171658)
+++ branches/safari-600.1-branch/Source/WebKit2/UIProcess/ios/WebPageProxyIOS.mm        2014-07-27 21:07:24 UTC (rev 171659)
</span><span class="lines">@@ -531,6 +531,17 @@
</span><span class="cx">     m_process-&gt;send(Messages::WebPage::SelectWordBackward(), m_pageID);
</span><span class="cx"> }
</span><span class="cx"> 
</span><ins>+void WebPageProxy::moveSelectionByOffset(int32_t offset, std::function&lt;void (CallbackBase::Error)&gt; callbackFunction)
+{
+    if (!isValid()) {
+        callbackFunction(CallbackBase::Error::Unknown);
+        return;
+    }
+    
+    uint64_t callbackID = m_callbacks.put(WTF::move(callbackFunction), std::make_unique&lt;ProcessThrottler::BackgroundActivityToken&gt;(m_process-&gt;throttler()));
+    m_process-&gt;send(Messages::WebPage::MoveSelectionByOffset(offset, callbackID), m_pageID);
+}
+
</ins><span class="cx"> void WebPageProxy::interpretKeyEvent(const EditorState&amp; state, bool isCharEvent, bool&amp; handled)
</span><span class="cx"> {
</span><span class="cx">     m_editorState = state;
</span></span></pre></div>
<a id="branchessafari6001branchSourceWebKit2WebProcessWebPageWebPageh"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/Source/WebKit2/WebProcess/WebPage/WebPage.h (171658 => 171659)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/Source/WebKit2/WebProcess/WebPage/WebPage.h        2014-07-27 18:45:58 UTC (rev 171658)
+++ branches/safari-600.1-branch/Source/WebKit2/WebProcess/WebPage/WebPage.h        2014-07-27 21:07:24 UTC (rev 171659)
</span><span class="lines">@@ -485,6 +485,7 @@
</span><span class="cx">     void selectWithTwoTouches(const WebCore::IntPoint&amp; from, const WebCore::IntPoint&amp; to, uint32_t gestureType, uint32_t gestureState, uint64_t callbackID);
</span><span class="cx">     void extendSelection(uint32_t granularity);
</span><span class="cx">     void selectWordBackward();
</span><ins>+    void moveSelectionByOffset(int32_t offset, uint64_t callbackID);
</ins><span class="cx">     void elementDidFocus(WebCore::Node*);
</span><span class="cx">     void elementDidBlur(WebCore::Node*);
</span><span class="cx">     void requestDictationContext(uint64_t callbackID);
</span></span></pre></div>
<a id="branchessafari6001branchSourceWebKit2WebProcessWebPageWebPagemessagesin"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/Source/WebKit2/WebProcess/WebPage/WebPage.messages.in (171658 => 171659)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/Source/WebKit2/WebProcess/WebPage/WebPage.messages.in        2014-07-27 18:45:58 UTC (rev 171658)
+++ branches/safari-600.1-branch/Source/WebKit2/WebProcess/WebPage/WebPage.messages.in        2014-07-27 21:07:24 UTC (rev 171659)
</span><span class="lines">@@ -64,6 +64,7 @@
</span><span class="cx">     SelectWithTwoTouches(WebCore::IntPoint from, WebCore::IntPoint to, uint32_t gestureType, uint32_t gestureState, uint64_t callbackID)
</span><span class="cx">     ExtendSelection(uint32_t granularity)
</span><span class="cx">     SelectWordBackward()
</span><ins>+    MoveSelectionByOffset(int32_t offset, uint64_t callbackID)
</ins><span class="cx">     RequestDictationContext(uint64_t callbackID)
</span><span class="cx">     ReplaceDictatedText(String oldText, String newText)
</span><span class="cx">     ReplaceSelectedText(String oldText, String newText)
</span></span></pre></div>
<a id="branchessafari6001branchSourceWebKit2WebProcessWebPageiosWebPageIOSmm"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm (171658 => 171659)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm        2014-07-27 18:45:58 UTC (rev 171658)
+++ branches/safari-600.1-branch/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm        2014-07-27 21:07:24 UTC (rev 171659)
</span><span class="lines">@@ -1532,6 +1532,25 @@
</span><span class="cx">         frame.selection().setSelectedRange(Range::create(*frame.document(), startPosition, position).get(), position.affinity(), true);
</span><span class="cx"> }
</span><span class="cx"> 
</span><ins>+void WebPage::moveSelectionByOffset(int32_t offset, uint64_t callbackID)
+{
+    Frame&amp; frame = m_page-&gt;focusController().focusedOrMainFrame();
+    
+    VisiblePosition startPosition = frame.selection().selection().end();
+    if (startPosition.isNull())
+        return;
+    SelectionDirection direction = offset &lt; 0 ? DirectionBackward : DirectionForward;
+    VisiblePosition position = startPosition;
+    for (int i = 0; i &lt; abs(offset); ++i) {
+        position = positionOfNextBoundaryOfGranularity(position, CharacterGranularity, direction);
+        if (position.isNull())
+            break;
+    }
+    if (position.isNotNull() &amp;&amp; startPosition != position)
+        frame.selection().setSelectedRange(Range::create(*frame.document(), position, position).get(), position.affinity(), true);
+    send(Messages::WebPageProxy::VoidCallback(callbackID));
+}
+
</ins><span class="cx"> void WebPage::convertSelectionRectsToRootView(FrameView* view, Vector&lt;SelectionRect&gt;&amp; selectionRects)
</span><span class="cx"> {
</span><span class="cx">     for (size_t i = 0; i &lt; selectionRects.size(); ++i) {
</span></span></pre>
</div>
</div>

</body>
</html>