<!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>[183208] 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/183208">183208</a></dd>
<dt>Author</dt> <dd>enrica@apple.com</dd>
<dt>Date</dt> <dd>2015-04-23 14:03:46 -0700 (Thu, 23 Apr 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Support share button.
https://bugs.webkit.org/show_bug.cgi?id=144077
rdar://problem/19772892
Reviewed by Darin Adler.
* UIProcess/ios/WKContentViewInteraction.mm:
(-[WKContentView _share:]):
(-[WKContentView canPerformAction:withSender:]):
(-[WKContentView _define:]):
(-[WKContentView accessibilityRetrieveSpeakSelectionContent]):
(-[WKContentView moveByOffset:]):
(-[WKContentView requestAutocorrectionRectsForString:withCompletionHandler:]):
(-[WKContentView applyAutocorrection:toString:withCompletionHandler:]):
(-[WKContentView requestAutocorrectionContextWithCompletionHandler:]):
(-[WKContentView accessoryTab:]):
(-[WKContentView _becomeFirstResponderWithSelectionMovingForward:completionHandler:]):
(-[WKContentView executeEditCommandWithCallback:]):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</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 (183207 => 183208)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2015-04-23 20:47:31 UTC (rev 183207)
+++ trunk/Source/WebKit2/ChangeLog 2015-04-23 21:03:46 UTC (rev 183208)
</span><span class="lines">@@ -1,3 +1,24 @@
</span><ins>+2015-04-23 Enrica Casucci <enrica@apple.com>
+
+ Support share button.
+ https://bugs.webkit.org/show_bug.cgi?id=144077
+ rdar://problem/19772892
+
+ Reviewed by Darin Adler.
+
+ * UIProcess/ios/WKContentViewInteraction.mm:
+ (-[WKContentView _share:]):
+ (-[WKContentView canPerformAction:withSender:]):
+ (-[WKContentView _define:]):
+ (-[WKContentView accessibilityRetrieveSpeakSelectionContent]):
+ (-[WKContentView moveByOffset:]):
+ (-[WKContentView requestAutocorrectionRectsForString:withCompletionHandler:]):
+ (-[WKContentView applyAutocorrection:toString:withCompletionHandler:]):
+ (-[WKContentView requestAutocorrectionContextWithCompletionHandler:]):
+ (-[WKContentView accessoryTab:]):
+ (-[WKContentView _becomeFirstResponderWithSelectionMovingForward:completionHandler:]):
+ (-[WKContentView executeEditCommandWithCallback:]):
+
</ins><span class="cx"> 2015-04-23 Carlos Garcia Campos <cgarcia@igalia.com>
</span><span class="cx">
</span><span class="cx"> [UNIX] Do not allow copies of IPC::Attachment
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessiosWKContentViewInteractionmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm (183207 => 183208)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm 2015-04-23 20:47:31 UTC (rev 183207)
+++ trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm 2015-04-23 21:03:46 UTC (rev 183208)
</span><span class="lines">@@ -181,6 +181,7 @@
</span><span class="cx"> - (void)scheduleReplacementsForText:(NSString *)text;
</span><span class="cx"> - (void)showTextServiceFor:(NSString *)selectedTerm fromRect:(CGRect)presentationRect;
</span><span class="cx"> - (void)scheduleChineseTransliterationForText:(NSString *)text;
</span><ins>+- (void)showShareSheetFor:(NSString *)selectedTerm fromRect:(CGRect)presentationRect;
</ins><span class="cx"> @end
</span><span class="cx">
</span><span class="cx"> @interface UIWKSelectionAssistant (StagingToRemove)
</span><span class="lines">@@ -1293,6 +1294,24 @@
</span><span class="cx"> return (_page->editorState().isContentRichlyEditable) ? richTypes : plainTextTypes;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+- (void)_share:(id)sender
+{
+ RetainPtr<WKContentView> view = self;
+ _page->getSelectionOrContentsAsString([view](const String& string, CallbackBase::Error error) {
+ if (error != CallbackBase::Error::None)
+ return;
+ if (!string)
+ return;
+
+ CGRect presentationRect = view->_page->editorState().postLayoutData().selectionRects[0].rect();
+
+ if (view->_textSelectionAssistant && [view->_textSelectionAssistant respondsToSelector:@selector(showShareSheetFor:fromRect:)])
+ [view->_textSelectionAssistant showShareSheetFor:string fromRect:presentationRect];
+ else if (view->_webSelectionAssistant && [view->_webSelectionAssistant respondsToSelector:@selector(showShareSheetFor:fromRect:)])
+ [view->_webSelectionAssistant showShareSheetFor:string fromRect:presentationRect];
+ });
+}
+
</ins><span class="cx"> - (void)_addShortcut:(id)sender
</span><span class="cx"> {
</span><span class="cx"> if (_textSelectionAssistant && [_textSelectionAssistant respondsToSelector:@selector(showTextServiceFor:fromRect:)])
</span><span class="lines">@@ -1423,6 +1442,18 @@
</span><span class="cx"> return YES;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ if (action == @selector(_share:)) {
+ if (_page->editorState().isInPasswordField || !(hasWebSelection || _page->editorState().selectionIsRange))
+ return NO;
+
+ NSUInteger textLength = _page->editorState().postLayoutData().selectedTextLength;
+ // See FIXME above for _define.
+ if (!textLength || textLength > 200)
+ return NO;
+
+ return YES;
+ }
+
</ins><span class="cx"> if (action == @selector(_addShortcut:)) {
</span><span class="cx"> if (_page->editorState().isInPasswordField || !(hasWebSelection || _page->editorState().selectionIsRange))
</span><span class="cx"> return NO;
</span><span class="lines">@@ -1563,23 +1594,25 @@
</span><span class="cx"> if ([[getMCProfileConnectionClass() sharedConnection] effectiveBoolValueForSetting:MCFeatureDefinitionLookupAllowed] == MCRestrictedBoolExplicitNo)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- _page->getSelectionOrContentsAsString([self](const String& string, WebKit::CallbackBase::Error error) {
</del><ins>+ RetainPtr<WKContentView> view = self;
+ _page->getSelectionOrContentsAsString([view](const String& string, WebKit::CallbackBase::Error error) {
</ins><span class="cx"> if (error != WebKit::CallbackBase::Error::None)
</span><span class="cx"> return;
</span><span class="cx"> if (!string)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- [self _showDictionary:string];
</del><ins>+ [view _showDictionary:string];
</ins><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (void)accessibilityRetrieveSpeakSelectionContent
</span><span class="cx"> {
</span><del>- _page->getSelectionOrContentsAsString([self](const String& string, WebKit::CallbackBase::Error error) {
</del><ins>+ RetainPtr<WKContentView> view = self;
+ _page->getSelectionOrContentsAsString([view](const String& string, WebKit::CallbackBase::Error error) {
</ins><span class="cx"> if (error != WebKit::CallbackBase::Error::None)
</span><span class="cx"> return;
</span><del>- if ([self respondsToSelector:@selector(accessibilitySpeakSelectionSetContent:)])
- [self accessibilitySpeakSelectionSetContent:string];
</del><ins>+ if ([view respondsToSelector:@selector(accessibilitySpeakSelectionSetContent:)])
+ [view accessibilitySpeakSelectionSetContent:string];
</ins><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1867,8 +1900,9 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> [self beginSelectionChange];
</span><del>- _page->moveSelectionByOffset(offset, [self](WebKit::CallbackBase::Error) {
- [self endSelectionChange];
</del><ins>+ RetainPtr<WKContentView> view = self;
+ _page->moveSelectionByOffset(offset, [view](WebKit::CallbackBase::Error) {
+ [view endSelectionChange];
</ins><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1885,8 +1919,9 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ RetainPtr<WKContentView> view = self;
</ins><span class="cx"> _autocorrectionData.autocorrectionHandler = [completionHandler copy];
</span><del>- _page->requestAutocorrectionData(input, [self](const Vector<FloatRect>& rects, const String& fontName, double fontSize, uint64_t traits, WebKit::CallbackBase::Error) {
</del><ins>+ _page->requestAutocorrectionData(input, [view](const Vector<FloatRect>& rects, const String& fontName, double fontSize, uint64_t traits, WebKit::CallbackBase::Error) {
</ins><span class="cx"> CGRect firstRect = CGRectZero;
</span><span class="cx"> CGRect lastRect = CGRectZero;
</span><span class="cx"> if (rects.size()) {
</span><span class="lines">@@ -1894,15 +1929,15 @@
</span><span class="cx"> lastRect = rects[rects.size() - 1];
</span><span class="cx"> }
</span><span class="cx">
</span><del>- _autocorrectionData.fontName = fontName;
- _autocorrectionData.fontSize = fontSize;
- _autocorrectionData.fontTraits = traits;
- _autocorrectionData.textFirstRect = firstRect;
- _autocorrectionData.textLastRect = lastRect;
</del><ins>+ view->_autocorrectionData.fontName = fontName;
+ view->_autocorrectionData.fontSize = fontSize;
+ view->_autocorrectionData.fontTraits = traits;
+ view->_autocorrectionData.textFirstRect = firstRect;
+ view->_autocorrectionData.textLastRect = lastRect;
</ins><span class="cx">
</span><del>- _autocorrectionData.autocorrectionHandler(rects.size() ? [WKAutocorrectionRects autocorrectionRectsWithRects:firstRect lastRect:lastRect] : nil);
- [_autocorrectionData.autocorrectionHandler release];
- _autocorrectionData.autocorrectionHandler = nil;
</del><ins>+ view->_autocorrectionData.autocorrectionHandler(rects.size() ? [WKAutocorrectionRects autocorrectionRectsWithRects:firstRect lastRect:lastRect] : nil);
+ [view->_autocorrectionData.autocorrectionHandler release];
+ view->_autocorrectionData.autocorrectionHandler = nil;
</ins><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -2016,10 +2051,11 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx"> _autocorrectionData.autocorrectionHandler = [completionHandler copy];
</span><del>- _page->applyAutocorrection(correction, input, [self](const String& string, WebKit::CallbackBase::Error error) {
- _autocorrectionData.autocorrectionHandler(!string.isNull() ? [WKAutocorrectionRects autocorrectionRectsWithRects:_autocorrectionData.textFirstRect lastRect:_autocorrectionData.textLastRect] : nil);
- [_autocorrectionData.autocorrectionHandler release];
- _autocorrectionData.autocorrectionHandler = nil;
</del><ins>+ RetainPtr<WKContentView> view = self;
+ _page->applyAutocorrection(correction, input, [view](const String& string, WebKit::CallbackBase::Error error) {
+ view->_autocorrectionData.autocorrectionHandler(!string.isNull() ? [WKAutocorrectionRects autocorrectionRectsWithRects:view->_autocorrectionData.textFirstRect lastRect:view->_autocorrectionData.textLastRect] : nil);
+ [view->_autocorrectionData.autocorrectionHandler release];
+ view->_autocorrectionData.autocorrectionHandler = nil;
</ins><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -2039,8 +2075,9 @@
</span><span class="cx"> completionHandler([WKAutocorrectionContext autocorrectionContextWithData:beforeText markedText:markedText selectedText:selectedText afterText:afterText selectedRangeInMarkedText:NSMakeRange(location, length)]);
</span><span class="cx"> } else {
</span><span class="cx"> _autocorrectionData.autocorrectionContextHandler = [completionHandler copy];
</span><del>- _page->requestAutocorrectionContext([self](const String& beforeText, const String& markedText, const String& selectedText, const String& afterText, uint64_t location, uint64_t length, WebKit::CallbackBase::Error) {
- _autocorrectionData.autocorrectionContextHandler([WKAutocorrectionContext autocorrectionContextWithData:beforeText markedText:markedText selectedText:selectedText afterText:afterText selectedRangeInMarkedText:NSMakeRange(location, length)]);
</del><ins>+ RetainPtr<WKContentView> view = self;
+ _page->requestAutocorrectionContext([view](const String& beforeText, const String& markedText, const String& selectedText, const String& afterText, uint64_t location, uint64_t length, WebKit::CallbackBase::Error) {
+ view->_autocorrectionData.autocorrectionContextHandler([WKAutocorrectionContext autocorrectionContextWithData:beforeText markedText:markedText selectedText:selectedText afterText:afterText selectedRangeInMarkedText:NSMakeRange(location, length)]);
</ins><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -2074,9 +2111,10 @@
</span><span class="cx">
</span><span class="cx"> _didAccessoryTabInitiateFocus = YES; // Will be cleared in either -_displayFormNodeInputView or -cleanupInteraction.
</span><span class="cx"> [self beginSelectionChange];
</span><del>- _page->focusNextAssistedNode(isNext, [self](WebKit::CallbackBase::Error) {
- [self endSelectionChange];
- [self reloadInputViews];
</del><ins>+ RetainPtr<WKContentView> view = self;
+ _page->focusNextAssistedNode(isNext, [view](WebKit::CallbackBase::Error) {
+ [view endSelectionChange];
+ [view reloadInputViews];
</ins><span class="cx"> });
</span><span class="cx">
</span><span class="cx"> }
</span><span class="lines">@@ -2084,8 +2122,9 @@
</span><span class="cx"> - (void)_becomeFirstResponderWithSelectionMovingForward:(BOOL)selectingForward completionHandler:(void (^)(BOOL didBecomeFirstResponder))completionHandler
</span><span class="cx"> {
</span><span class="cx"> auto completionHandlerCopy = Block_copy(completionHandler);
</span><del>- _page->setInitialFocus(selectingForward, false, WebKit::WebKeyboardEvent(), [self, completionHandlerCopy](WebKit::CallbackBase::Error) {
- BOOL didBecomeFirstResponder = _assistedNodeInformation.elementType != InputType::None && [self becomeFirstResponder];
</del><ins>+ RetainPtr<WKContentView> view = self;
+ _page->setInitialFocus(selectingForward, false, WebKit::WebKeyboardEvent(), [view, completionHandlerCopy](WebKit::CallbackBase::Error) {
+ BOOL didBecomeFirstResponder = view->_assistedNodeInformation.elementType != InputType::None && [view becomeFirstResponder];
</ins><span class="cx"> completionHandlerCopy(didBecomeFirstResponder);
</span><span class="cx"> Block_release(completionHandlerCopy);
</span><span class="cx"> });
</span><span class="lines">@@ -2561,8 +2600,9 @@
</span><span class="cx"> - (void)executeEditCommandWithCallback:(NSString *)commandName
</span><span class="cx"> {
</span><span class="cx"> [self beginSelectionChange];
</span><del>- _page->executeEditCommand(commandName, [self](WebKit::CallbackBase::Error) {
- [self endSelectionChange];
</del><ins>+ RetainPtr<WKContentView> view = self;
+ _page->executeEditCommand(commandName, [view](WebKit::CallbackBase::Error) {
+ [view endSelectionChange];
</ins><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>