<!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>[211770] 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/211770">211770</a></dd>
<dt>Author</dt> <dd>mitz@apple.com</dd>
<dt>Date</dt> <dd>2017-02-06 20:23:52 -0800 (Mon, 06 Feb 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>[iOS] -[WKWebView becomeFirstResponder] and -[WKWebView resignFirstResponder] don’t get called when non-programmatic first responder changes happen
https://bugs.webkit.org/show_bug.cgi?id=167898
Reviewed by Tim Horton.
Made WKContentView’s -becomeFirstResponder and -resignFirstResponder forward to the
WKWebView, giving subclasses an opportunity to override these methods. Changed the WKWebView
implementations to call back into WKContentView methods that actually do the work.
* UIProcess/API/Cocoa/WKWebView.mm:
(-[WKWebView becomeFirstResponder]): If the current content view is a WKContentView, call
-becomeFirstResponderForWebView. Added a check that the content view has a superview to
get the right behavior when this is called during the transition from not having to having
a custom content view.
(-[WKWebView canBecomeFirstResponder]): If the current content view is a WKContentView, call
-canBecomeFirstResponderForWebView.
(-[WKWebView resignFirstResponder]): If the current content view is a WKContentView, call
-resignFirstResponderForWebView.
(-[WKWebView _setHasCustomContentView:loadedMIMEType:]): If the new content view is a
WKContentView, use -canBecomeFirstResponderForWebView.
* UIProcess/ios/WKContentViewInteraction.h: Added _becomingFirstResponder ivar.
* UIProcess/ios/WKContentViewInteraction.mm:
(-[WKContentView canBecomeFirstResponder]): Return _becomingFirstResponder. Normally this is
NO, so code that hit-tests then walks up the view hierarchy to select a first responder
will continue to the WKWebView. But we need to return YES around the call to super’s
-becomeFirstResponder in -becomeFirstResponderForWebView.
(-[WKContentView canBecomeFirstResponderForWebView]): Moved the old
-becomeFirstResponderForWebView implementation here.
(-[WKContentView becomeFirstResponder]): Forward to the WKWebView.
(-[WKContentView becomeFirstResponderForWebView]): Moved the old -becomeFirstResponder
implementation here, setting _becomingFirstResponder to YES around the call to super.
(-[WKContentView resignFirstResponder]): Forward to the WKWebView.
(-[WKContentView resignFirstResponderForWebView]): Moved the old -resignFirstResponder
implementation 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 (211769 => 211770)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2017-02-07 04:19:24 UTC (rev 211769)
+++ trunk/Source/WebKit2/ChangeLog 2017-02-07 04:23:52 UTC (rev 211770)
</span><span class="lines">@@ -1,3 +1,41 @@
</span><ins>+2017-02-06 Dan Bernstein <mitz@apple.com>
+
+ [iOS] -[WKWebView becomeFirstResponder] and -[WKWebView resignFirstResponder] don’t get called when non-programmatic first responder changes happen
+ https://bugs.webkit.org/show_bug.cgi?id=167898
+
+ Reviewed by Tim Horton.
+
+ Made WKContentView’s -becomeFirstResponder and -resignFirstResponder forward to the
+ WKWebView, giving subclasses an opportunity to override these methods. Changed the WKWebView
+ implementations to call back into WKContentView methods that actually do the work.
+
+ * UIProcess/API/Cocoa/WKWebView.mm:
+ (-[WKWebView becomeFirstResponder]): If the current content view is a WKContentView, call
+ -becomeFirstResponderForWebView. Added a check that the content view has a superview to
+ get the right behavior when this is called during the transition from not having to having
+ a custom content view.
+ (-[WKWebView canBecomeFirstResponder]): If the current content view is a WKContentView, call
+ -canBecomeFirstResponderForWebView.
+ (-[WKWebView resignFirstResponder]): If the current content view is a WKContentView, call
+ -resignFirstResponderForWebView.
+ (-[WKWebView _setHasCustomContentView:loadedMIMEType:]): If the new content view is a
+ WKContentView, use -canBecomeFirstResponderForWebView.
+
+ * UIProcess/ios/WKContentViewInteraction.h: Added _becomingFirstResponder ivar.
+ * UIProcess/ios/WKContentViewInteraction.mm:
+ (-[WKContentView canBecomeFirstResponder]): Return _becomingFirstResponder. Normally this is
+ NO, so code that hit-tests then walks up the view hierarchy to select a first responder
+ will continue to the WKWebView. But we need to return YES around the call to super’s
+ -becomeFirstResponder in -becomeFirstResponderForWebView.
+ (-[WKContentView canBecomeFirstResponderForWebView]): Moved the old
+ -becomeFirstResponderForWebView implementation here.
+ (-[WKContentView becomeFirstResponder]): Forward to the WKWebView.
+ (-[WKContentView becomeFirstResponderForWebView]): Moved the old -becomeFirstResponder
+ implementation here, setting _becomingFirstResponder to YES around the call to super.
+ (-[WKContentView resignFirstResponder]): Forward to the WKWebView.
+ (-[WKContentView resignFirstResponderForWebView]): Moved the old -resignFirstResponder
+ implementation here.
+
</ins><span class="cx"> 2017-02-06 Simon Fraser <simon.fraser@apple.com>
</span><span class="cx">
</span><span class="cx"> Remove assertion in WebViewImpl::performKeyEquivalent()
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKWebViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm (211769 => 211770)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2017-02-07 04:19:24 UTC (rev 211769)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2017-02-07 04:23:52 UTC (rev 211770)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2014-2016 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2014-2017 Apple Inc. All rights reserved.
</ins><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="cx"> * modification, are permitted provided that the following conditions
</span><span class="lines">@@ -1013,16 +1013,29 @@
</span><span class="cx">
</span><span class="cx"> - (BOOL)becomeFirstResponder
</span><span class="cx"> {
</span><del>- return [self._currentContentView becomeFirstResponder] || [super becomeFirstResponder];
</del><ins>+ UIView *currentContentView = self._currentContentView;
+ if (currentContentView == _contentView && [_contentView superview])
+ return [_contentView becomeFirstResponderForWebView] || [super becomeFirstResponder];
+
+ return [currentContentView becomeFirstResponder] || [super becomeFirstResponder];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (BOOL)canBecomeFirstResponder
</span><span class="cx"> {
</span><del>- if (self._currentContentView == _contentView && [_contentView isResigningFirstResponder])
- return NO;
</del><ins>+ if (self._currentContentView == _contentView)
+ return [_contentView canBecomeFirstResponderForWebView];
+
</ins><span class="cx"> return YES;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+- (BOOL)resignFirstResponder
+{
+ if ([_contentView isFirstResponder])
+ return [_contentView resignFirstResponderForWebView];
+
+ return [super resignFirstResponder];
+}
+
</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 class="lines">@@ -1089,8 +1102,11 @@
</span><span class="cx"> [self addSubview:_customContentFixedOverlayView.get()];
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (self.isFirstResponder && self._currentContentView.canBecomeFirstResponder)
- [self._currentContentView becomeFirstResponder];
</del><ins>+ if (self.isFirstResponder) {
+ UIView *currentContentView = self._currentContentView;
+ if (currentContentView == _contentView ? [_contentView canBecomeFirstResponderForWebView] : currentContentView.canBecomeFirstResponder)
+ [currentContentView becomeFirstResponder];
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (void)_didFinishLoadingDataForCustomContentProviderWithSuggestedFilename:(const String&)suggestedFilename data:(NSData *)data
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessiosWKContentViewInteractionh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.h (211769 => 211770)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.h 2017-02-07 04:19:24 UTC (rev 211769)
+++ trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.h 2017-02-07 04:23:52 UTC (rev 211770)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2012-2014 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2012-2017 Apple Inc. All rights reserved.
</ins><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="cx"> * modification, are permitted provided that the following conditions
</span><span class="lines">@@ -184,6 +184,7 @@
</span><span class="cx"> BOOL _isExpectingFastSingleTapCommit;
</span><span class="cx"> BOOL _showDebugTapHighlightsForFastClicking;
</span><span class="cx">
</span><ins>+ BOOL _becomingFirstResponder;
</ins><span class="cx"> BOOL _resigningFirstResponder;
</span><span class="cx"> BOOL _needsDeferredEndScrollingSelectionUpdate;
</span><span class="cx">
</span><span class="lines">@@ -213,6 +214,10 @@
</span><span class="cx">
</span><span class="cx"> - (void)scrollViewWillStartPanOrPinchGesture;
</span><span class="cx">
</span><ins>+- (BOOL)canBecomeFirstResponderForWebView;
+- (BOOL)becomeFirstResponderForWebView;
+- (BOOL)resignFirstResponderForWebView;
+
</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 (211769 => 211770)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm 2017-02-07 04:19:24 UTC (rev 211769)
+++ trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm 2017-02-07 04:23:52 UTC (rev 211770)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2012-2014 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2012-2017 Apple Inc. All rights reserved.
</ins><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="cx"> * modification, are permitted provided that the following conditions
</span><span class="lines">@@ -80,6 +80,7 @@
</span><span class="cx"> #import <WebCore/WebEvent.h>
</span><span class="cx"> #import <WebKit/WebSelectionRect.h> // FIXME: WK2 should not include WebKit headers!
</span><span class="cx"> #import <wtf/RetainPtr.h>
</span><ins>+#import <wtf/SetForScope.h>
</ins><span class="cx">
</span><span class="cx"> #if ENABLE(DATA_INTERACTION)
</span><span class="cx"> #import <WebCore/PlatformPasteboard.h>
</span><span class="lines">@@ -830,6 +831,11 @@
</span><span class="cx">
</span><span class="cx"> - (BOOL)canBecomeFirstResponder
</span><span class="cx"> {
</span><ins>+ return _becomingFirstResponder;
+}
+
+- (BOOL)canBecomeFirstResponderForWebView
+{
</ins><span class="cx"> if (_resigningFirstResponder)
</span><span class="cx"> return NO;
</span><span class="cx"> // We might want to return something else
</span><span class="lines">@@ -839,9 +845,19 @@
</span><span class="cx">
</span><span class="cx"> - (BOOL)becomeFirstResponder
</span><span class="cx"> {
</span><ins>+ return [_webView becomeFirstResponder];
+}
+
+- (BOOL)becomeFirstResponderForWebView
+{
</ins><span class="cx"> if (_resigningFirstResponder)
</span><span class="cx"> return NO;
</span><del>- BOOL didBecomeFirstResponder = [super becomeFirstResponder];
</del><ins>+
+ BOOL didBecomeFirstResponder;
+ {
+ SetForScope<BOOL> becomingFirstResponder { _becomingFirstResponder, YES };
+ didBecomeFirstResponder = [super becomeFirstResponder];
+ }
</ins><span class="cx"> if (didBecomeFirstResponder)
</span><span class="cx"> [_textSelectionAssistant activateSelection];
</span><span class="cx">
</span><span class="lines">@@ -850,6 +866,11 @@
</span><span class="cx">
</span><span class="cx"> - (BOOL)resignFirstResponder
</span><span class="cx"> {
</span><ins>+ return [_webView resignFirstResponder];
+}
+
+- (BOOL)resignFirstResponderForWebView
+{
</ins><span class="cx"> // FIXME: Maybe we should call resignFirstResponder on the superclass
</span><span class="cx"> // and do nothing if the return value is NO.
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>