<!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>[183503] 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/183503">183503</a></dd>
<dt>Author</dt> <dd>enrica@apple.com</dd>
<dt>Date</dt> <dd>2015-04-28 13:18:36 -0700 (Tue, 28 Apr 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Add support for lookup on iOS.
https://bugs.webkit.org/show_bug.cgi?id=144342
rdar://problem/19994090
Reviewed by Tim Horton.
* UIProcess/WebPageProxy.h:
* UIProcess/ios/WKContentViewInteraction.mm:
(-[WKContentView _lookup:]):
(-[WKContentView canPerformAction:withSender:]):
* UIProcess/ios/WebPageProxyIOS.mm:
(WebKit::WebPageProxy::getLookupContextAtPoint):
* WebProcess/WebPage/WebPage.h:
* WebProcess/WebPage/WebPage.messages.in:
* WebProcess/WebPage/ios/WebPageIOS.mm:
(WebKit::WebPage::getLookupContextAtPoint):</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 (183502 => 183503)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2015-04-28 20:01:13 UTC (rev 183502)
+++ trunk/Source/WebKit2/ChangeLog 2015-04-28 20:18:36 UTC (rev 183503)
</span><span class="lines">@@ -1,3 +1,22 @@
</span><ins>+2015-04-28 Enrica Casucci <enrica@apple.com>
+
+ Add support for lookup on iOS.
+ https://bugs.webkit.org/show_bug.cgi?id=144342
+ rdar://problem/19994090
+
+ Reviewed by Tim Horton.
+
+ * UIProcess/WebPageProxy.h:
+ * UIProcess/ios/WKContentViewInteraction.mm:
+ (-[WKContentView _lookup:]):
+ (-[WKContentView canPerformAction:withSender:]):
+ * UIProcess/ios/WebPageProxyIOS.mm:
+ (WebKit::WebPageProxy::getLookupContextAtPoint):
+ * WebProcess/WebPage/WebPage.h:
+ * WebProcess/WebPage/WebPage.messages.in:
+ * WebProcess/WebPage/ios/WebPageIOS.mm:
+ (WebKit::WebPage::getLookupContextAtPoint):
+
</ins><span class="cx"> 2015-04-28 Brady Eidson <beidson@apple.com>
</span><span class="cx">
</span><span class="cx"> Consolidate most "frame load" arguments into FrameLoadRequest.
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebPageProxyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.h (183502 => 183503)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebPageProxy.h 2015-04-28 20:01:13 UTC (rev 183502)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.h 2015-04-28 20:18:36 UTC (rev 183503)
</span><span class="lines">@@ -501,6 +501,7 @@
</span><span class="cx"> void viewportMetaTagWidthDidChange(float width);
</span><span class="cx"> void didFinishDrawingPagesToPDF(const IPC::DataReference&);
</span><span class="cx"> void contentSizeCategoryDidChange(const String& contentSizeCategory);
</span><ins>+ void getLookupContextAtPoint(const WebCore::IntPoint&, std::function<void(const String&, CallbackBase::Error)>);
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> void didCommitLayerTree(const WebKit::RemoteLayerTreeTransaction&);
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessiosWKContentViewInteractionmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm (183502 => 183503)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm 2015-04-28 20:01:13 UTC (rev 183502)
+++ trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm 2015-04-28 20:18:36 UTC (rev 183503)
</span><span class="lines">@@ -182,11 +182,13 @@
</span><span class="cx"> - (void)showTextServiceFor:(NSString *)selectedTerm fromRect:(CGRect)presentationRect;
</span><span class="cx"> - (void)scheduleChineseTransliterationForText:(NSString *)text;
</span><span class="cx"> - (void)showShareSheetFor:(NSString *)selectedTerm fromRect:(CGRect)presentationRect;
</span><ins>+- (void)lookup:(NSString *)textWithContext fromRect:(CGRect)presentationRect;
</ins><span class="cx"> @end
</span><span class="cx">
</span><span class="cx"> @interface UIWKSelectionAssistant (StagingToRemove)
</span><span class="cx"> - (void)showTextServiceFor:(NSString *)selectedTerm fromRect:(CGRect)presentationRect;
</span><span class="cx"> - (void)showShareSheetFor:(NSString *)selectedTerm fromRect:(CGRect)presentationRect;
</span><ins>+- (void)lookup:(NSString *)textWithContext fromRect:(CGRect)presentationRect;
</ins><span class="cx"> @end
</span><span class="cx">
</span><span class="cx"> @interface UIKeyboardImpl (StagingToRemove)
</span><span class="lines">@@ -1295,6 +1297,24 @@
</span><span class="cx"> return (_page->editorState().isContentRichlyEditable) ? richTypes : plainTextTypes;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+- (void)_lookup:(CGPoint)point
+{
+ RetainPtr<WKContentView> view = self;
+ _page->getLookupContextAtPoint(WebCore::IntPoint(point), [view](const String& string, CallbackBase::Error error) {
+ if (error != CallbackBase::Error::None)
+ return;
+ if (!string)
+ return;
+
+ CGRect presentationRect = view->_page->editorState().selectionIsRange ? view->_page->editorState().postLayoutData().selectionRects[0].rect() : view->_page->editorState().postLayoutData().caretRectAtStart;
+
+ if (view->_textSelectionAssistant && [view->_textSelectionAssistant respondsToSelector:@selector(lookup:fromRect:)])
+ [view->_textSelectionAssistant lookup:string fromRect:presentationRect];
+ else if (view->_webSelectionAssistant && [view->_webSelectionAssistant respondsToSelector:@selector(lookup:fromRect:)])
+ [view->_webSelectionAssistant lookup:string fromRect:presentationRect];
+ });
+}
+
</ins><span class="cx"> - (void)_share:(id)sender
</span><span class="cx"> {
</span><span class="cx"> RetainPtr<WKContentView> view = self;
</span><span class="lines">@@ -1443,6 +1463,16 @@
</span><span class="cx"> return YES;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ if (action == @selector(_lookup:)) {
+ if (_page->editorState().isInPasswordField)
+ return NO;
+
+ if ([[getMCProfileConnectionClass() sharedConnection] effectiveBoolValueForSetting:MCFeatureDefinitionLookupAllowed] == MCRestrictedBoolExplicitNo)
+ return NO;
+
+ return YES;
+ }
+
</ins><span class="cx"> if (action == @selector(_share:)) {
</span><span class="cx"> if (_page->editorState().isInPasswordField || !(hasWebSelection || _page->editorState().selectionIsRange))
</span><span class="cx"> return NO;
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessiosWebPageProxyIOSmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/ios/WebPageProxyIOS.mm (183502 => 183503)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/ios/WebPageProxyIOS.mm 2015-04-28 20:01:13 UTC (rev 183502)
+++ trunk/Source/WebKit2/UIProcess/ios/WebPageProxyIOS.mm 2015-04-28 20:18:36 UTC (rev 183503)
</span><span class="lines">@@ -513,6 +513,17 @@
</span><span class="cx"> m_process->sendSync(Messages::WebPage::GetAutocorrectionContext(), Messages::WebPage::GetAutocorrectionContext::Reply(beforeContext, markedText, selectedText, afterContext, location, length), m_pageID);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void WebPageProxy::getLookupContextAtPoint(const WebCore::IntPoint& point, std::function<void(const String&, CallbackBase::Error)> callbackFunction)
+{
+ if (!isValid()) {
+ callbackFunction(String(), CallbackBase::Error::Unknown);
+ return;
+ }
+
+ uint64_t callbackID = m_callbacks.put(WTF::move(callbackFunction), m_process->throttler().backgroundActivityToken());
+ m_process->send(Messages::WebPage::GetLookupContextAtPoint(point, callbackID), m_pageID);
+}
+
</ins><span class="cx"> void WebPageProxy::selectWithTwoTouches(const WebCore::IntPoint from, const WebCore::IntPoint to, uint32_t gestureType, uint32_t gestureState, std::function<void (const WebCore::IntPoint&, uint32_t, uint32_t, uint32_t, CallbackBase::Error)> callbackFunction)
</span><span class="cx"> {
</span><span class="cx"> if (!isValid()) {
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageWebPageh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h (183502 => 183503)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h 2015-04-28 20:01:13 UTC (rev 183502)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h 2015-04-28 20:18:36 UTC (rev 183503)
</span><span class="lines">@@ -526,6 +526,7 @@
</span><span class="cx"> void resetAssistedNodeForFrame(WebFrame*);
</span><span class="cx"> WebCore::IntRect rectForElementAtInteractionLocation();
</span><span class="cx"> void updateSelectionAppearance();
</span><ins>+ void getLookupContextAtPoint(const WebCore::IntPoint, uint64_t callbackID);
</ins><span class="cx">
</span><span class="cx"> #if ENABLE(IOS_TOUCH_EVENTS)
</span><span class="cx"> void dispatchAsynchronousTouchEvents(const Vector<WebTouchEvent, 1>& queue);
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageWebPagemessagesin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.messages.in (183502 => 183503)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.messages.in 2015-04-28 20:01:13 UTC (rev 183502)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.messages.in 2015-04-28 20:18:36 UTC (rev 183503)
</span><span class="lines">@@ -91,6 +91,7 @@
</span><span class="cx"> ApplicationDidBecomeActive()
</span><span class="cx"> ContentSizeCategoryDidChange(String contentSizeCategory)
</span><span class="cx"> ExecuteEditCommandWithCallback(String name, uint64_t callbackID)
</span><ins>+ GetLookupContextAtPoint(WebCore::IntPoint point, uint64_t callbackID)
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if ENABLE(REMOTE_INSPECTOR)
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageiosWebPageIOSmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm (183502 => 183503)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm 2015-04-28 20:01:13 UTC (rev 183502)
+++ trunk/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm 2015-04-28 20:18:36 UTC (rev 183503)
</span><span class="lines">@@ -406,6 +406,20 @@
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void WebPage::getLookupContextAtPoint(const WebCore::IntPoint point, uint64_t callbackID)
+{
+ Frame& frame = m_page->focusController().focusedOrMainFrame();
+ VisiblePosition position = frame.visiblePositionForPoint(point);
+ String resultString;
+ if (!position.isNull()) {
+ // As context, we are going to use 250 characters of text before and after the point.
+ RefPtr<Range> fullCharacterRange = rangeExpandedAroundPositionByCharacters(position, 250);
+ if (fullCharacterRange)
+ resultString = plainText(fullCharacterRange.get());
+ }
+ send(Messages::WebPageProxy::StringCallback(resultString, callbackID));
+}
+
</ins><span class="cx"> NSObject *WebPage::accessibilityObjectForMainFramePlugin()
</span><span class="cx"> {
</span><span class="cx"> if (!m_page)
</span></span></pre>
</div>
</div>
</body>
</html>