<!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>[211897] 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/211897">211897</a></dd>
<dt>Author</dt> <dd>mitz@apple.com</dd>
<dt>Date</dt> <dd>2017-02-08 13:34:40 -0800 (Wed, 08 Feb 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>[iOS] WKWebView doesn’t have implementations of UIResponderStandardEditActions that can be overridden
https://bugs.webkit.org/show_bug.cgi?id=167974
Reviewed by Tim Horton.
* UIProcess/API/Cocoa/WKWebView.mm:
Gave each of the actions in FOR_EACH_WKCONTENTVIEW_ACTION an implementation that sends it
to the WKContentView if we’re using one.
(-[WKWebView canPerformAction:withSender:]): Override and for each of the actions in
FOR_EACH_WKCONTENTVIEW_ACTION, forward to
-[WKContentView canPerformActionForWebView:withSender:] if we’re using a WKContentView,
otherwise returning NO.
* UIProcess/ios/WKContentViewInteraction.h: Declared -canPerformActionForWebView:withSender:
and several internal methods we override.
* UIProcess/ios/WKContentViewInteraction.mm:
(-[WKContentView canPerformAction:withSender:]): Now returns NO so that the target for any
action is the WKWebView.
(-[WKContentView canPerformActionForWebView:withSender:]): Moved the logic previously in
-canPerformAction:withSender: to here.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICocoaWKWebViewmm">trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessiosWKContentViewInteractionh">trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.h</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 (211896 => 211897)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2017-02-08 21:21:45 UTC (rev 211896)
+++ trunk/Source/WebKit2/ChangeLog 2017-02-08 21:34:40 UTC (rev 211897)
</span><span class="lines">@@ -1,3 +1,26 @@
</span><ins>+2017-02-08 Dan Bernstein <mitz@apple.com>
+
+ [iOS] WKWebView doesn’t have implementations of UIResponderStandardEditActions that can be overridden
+ https://bugs.webkit.org/show_bug.cgi?id=167974
+
+ Reviewed by Tim Horton.
+
+ * UIProcess/API/Cocoa/WKWebView.mm:
+ Gave each of the actions in FOR_EACH_WKCONTENTVIEW_ACTION an implementation that sends it
+ to the WKContentView if we’re using one.
+ (-[WKWebView canPerformAction:withSender:]): Override and for each of the actions in
+ FOR_EACH_WKCONTENTVIEW_ACTION, forward to
+ -[WKContentView canPerformActionForWebView:withSender:] if we’re using a WKContentView,
+ otherwise returning NO.
+
+ * UIProcess/ios/WKContentViewInteraction.h: Declared -canPerformActionForWebView:withSender:
+ and several internal methods we override.
+ * UIProcess/ios/WKContentViewInteraction.mm:
+ (-[WKContentView canPerformAction:withSender:]): Now returns NO so that the target for any
+ action is the WKWebView.
+ (-[WKContentView canPerformActionForWebView:withSender:]): Moved the logic previously in
+ -canPerformAction:withSender: to here.
+
</ins><span class="cx"> 2017-02-08 Antti Koivisto <antti@apple.com>
</span><span class="cx">
</span><span class="cx"> Allow speculative redirects
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKWebViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm (211896 => 211897)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2017-02-08 21:21:45 UTC (rev 211896)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2017-02-08 21:34:40 UTC (rev 211897)
</span><span class="lines">@@ -1045,6 +1045,52 @@
</span><span class="cx"> return [super resignFirstResponder];
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+#define FOR_EACH_WKCONTENTVIEW_ACTION(M) \
+ M(_addShortcut) \
+ M(_arrowKey) \
+ M(_define) \
+ M(_lookup) \
+ M(_promptForReplace) \
+ M(_reanalyze) \
+ M(_share) \
+ M(_showTextStyleOptions) \
+ M(_transliterateChinese) \
+ M(copy) \
+ M(cut) \
+ M(paste) \
+ M(replace) \
+ M(select) \
+ M(selectAll) \
+ M(toggleBoldface) \
+ M(toggleItalics) \
+ M(toggleUnderline) \
+
+#define FORWARD_ACTION_TO_WKCONTENTVIEW(_action) \
+ - (void)_action:(id)sender \
+ { \
+ if (self.usesStandardContentView) \
+ [_contentView _action:sender]; \
+ }
+
+FOR_EACH_WKCONTENTVIEW_ACTION(FORWARD_ACTION_TO_WKCONTENTVIEW)
+
+#undef FORWARD_ACTION_TO_WKCONTENTVIEW
+
+- (BOOL)canPerformAction:(SEL)action withSender:(id)sender
+{
+ #define FORWARD_CANPERFORMACTION_TO_WKCONTENTVIEW(_action) \
+ if (action == @selector(_action:)) \
+ return self.usesStandardContentView && [_contentView canPerformActionForWebView:action withSender:sender];
+
+ FOR_EACH_WKCONTENTVIEW_ACTION(FORWARD_CANPERFORMACTION_TO_WKCONTENTVIEW)
+
+ #undef FORWARD_CANPERFORMACTION_TO_WKCONTENTVIEW
+
+ return [super canPerformAction:action withSender:sender];
+}
+
+#undef FOR_EACH_WKCONTENTVIEW_ACTION
+
</ins><span class="cx"> static inline CGFloat floorToDevicePixel(CGFloat input, float deviceScaleFactor)
</span><span class="cx"> {
</span><span class="cx"> return CGFloor(input * deviceScaleFactor) / deviceScaleFactor;
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessiosWKContentViewInteractionh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.h (211896 => 211897)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.h 2017-02-08 21:21:45 UTC (rev 211896)
+++ trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.h 2017-02-08 21:34:40 UTC (rev 211897)
</span><span class="lines">@@ -217,7 +217,16 @@
</span><span class="cx"> - (BOOL)canBecomeFirstResponderForWebView;
</span><span class="cx"> - (BOOL)becomeFirstResponderForWebView;
</span><span class="cx"> - (BOOL)resignFirstResponderForWebView;
</span><ins>+- (BOOL)canPerformActionForWebView:(SEL)action withSender:(id)sender;
</ins><span class="cx">
</span><ins>+- (void)_addShortcut:(id)sender;
+- (void)_arrowKey:(id)sender;
+- (void)_define:(id)sender;
+- (void)_lookup:(id)sender;
+- (void)_reanalyze:(id)sender;
+- (void)_share:(id)sender;
+- (void)_showTextStyleOptions:(id)sender;
+
</ins><span class="cx"> #if ENABLE(TOUCH_EVENTS)
</span><span class="cx"> - (void)_webTouchEvent:(const WebKit::NativeWebTouchEvent&)touchEvent preventsNativeGestures:(BOOL)preventsDefault;
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessiosWKContentViewInteractionmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm (211896 => 211897)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm 2017-02-08 21:21:45 UTC (rev 211896)
+++ trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm 2017-02-08 21:34:40 UTC (rev 211897)
</span><span class="lines">@@ -1995,6 +1995,11 @@
</span><span class="cx">
</span><span class="cx"> - (BOOL)canPerformAction:(SEL)action withSender:(id)sender
</span><span class="cx"> {
</span><ins>+ return NO;
+}
+
+- (BOOL)canPerformActionForWebView:(SEL)action withSender:(id)sender
+{
</ins><span class="cx"> BOOL hasWebSelection = _webSelectionAssistant && !CGRectIsEmpty(_webSelectionAssistant.get().selectionFrame);
</span><span class="cx">
</span><span class="cx"> if (action == @selector(_arrowKey:))
</span></span></pre>
</div>
</div>
</body>
</html>