<!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>[195602] 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/195602">195602</a></dd>
<dt>Author</dt> <dd>timothy_horton@apple.com</dd>
<dt>Date</dt> <dd>2016-01-26 11:12:37 -0800 (Tue, 26 Jan 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>REGRESSION (<a href="http://trac.webkit.org/projects/webkit/changeset/194557">r194557</a>): Keyboard shortcuts stop working after the WKWebView is unparented and reparented
https://bugs.webkit.org/show_bug.cgi?id=153492
<rdar://problem/24138989>
Reviewed by Dan Bernstein.
* UIProcess/ios/WKContentViewInteraction.h:
* UIProcess/ios/WKContentViewInteraction.mm:
(-[WKContentView canBecomeFirstResponder]):
(-[WKContentView becomeFirstResponder]):
(-[WKContentView resignFirstResponder]):
When WKWebView is unparented, WKContentView will attempt to resignFirstResponder upwards,
first asking WKWebView. After <a href="http://trac.webkit.org/projects/webkit/changeset/194557">r194557</a>, WKWebView will accept first responder and forward
it on to the WKContentView, which will happily accept it again, despite being the view
that's trying to resign. This will cause us to completely lose first responder,
where it was actually supposed to propagate up above WKWebView to the client.
Keep track of when WKContentView is resigning first responder, and don't
let it become first responder while it is doing so, breaking the cycle.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</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 (195601 => 195602)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2016-01-26 19:02:40 UTC (rev 195601)
+++ trunk/Source/WebKit2/ChangeLog 2016-01-26 19:12:37 UTC (rev 195602)
</span><span class="lines">@@ -1,3 +1,25 @@
</span><ins>+2016-01-26 Tim Horton <timothy_horton@apple.com>
+
+ REGRESSION (r194557): Keyboard shortcuts stop working after the WKWebView is unparented and reparented
+ https://bugs.webkit.org/show_bug.cgi?id=153492
+ <rdar://problem/24138989>
+
+ Reviewed by Dan Bernstein.
+
+ * UIProcess/ios/WKContentViewInteraction.h:
+ * UIProcess/ios/WKContentViewInteraction.mm:
+ (-[WKContentView canBecomeFirstResponder]):
+ (-[WKContentView becomeFirstResponder]):
+ (-[WKContentView resignFirstResponder]):
+ When WKWebView is unparented, WKContentView will attempt to resignFirstResponder upwards,
+ first asking WKWebView. After r194557, WKWebView will accept first responder and forward
+ it on to the WKContentView, which will happily accept it again, despite being the view
+ that's trying to resign. This will cause us to completely lose first responder,
+ where it was actually supposed to propagate up above WKWebView to the client.
+
+ Keep track of when WKContentView is resigning first responder, and don't
+ let it become first responder while it is doing so, breaking the cycle.
+
</ins><span class="cx"> 2016-01-25 Ada Chan <adachan@apple.com>
</span><span class="cx">
</span><span class="cx"> Move WebVideoFullscreenManager and related classes from iOS specific folders to cocoa folders
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessiosWKContentViewInteractionh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.h (195601 => 195602)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.h 2016-01-26 19:02:40 UTC (rev 195601)
+++ trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.h 2016-01-26 19:12:37 UTC (rev 195602)
</span><span class="lines">@@ -161,6 +161,8 @@
</span><span class="cx"> BOOL _didAccessoryTabInitiateFocus;
</span><span class="cx"> BOOL _isExpectingFastSingleTapCommit;
</span><span class="cx"> BOOL _showDebugTapHighlightsForFastClicking;
</span><ins>+
+ BOOL _isResigningFirstResponder;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> @end
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessiosWKContentViewInteractionmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm (195601 => 195602)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm 2016-01-26 19:02:40 UTC (rev 195601)
+++ trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm 2016-01-26 19:12:37 UTC (rev 195602)
</span><span class="lines">@@ -669,6 +669,8 @@
</span><span class="cx">
</span><span class="cx"> - (BOOL)canBecomeFirstResponder
</span><span class="cx"> {
</span><ins>+ if (_isResigningFirstResponder)
+ return NO;
</ins><span class="cx"> // We might want to return something else
</span><span class="cx"> // if we decide to enable/disable interaction programmatically.
</span><span class="cx"> return YES;
</span><span class="lines">@@ -676,6 +678,8 @@
</span><span class="cx">
</span><span class="cx"> - (BOOL)becomeFirstResponder
</span><span class="cx"> {
</span><ins>+ if (_isResigningFirstResponder)
+ return NO;
</ins><span class="cx"> BOOL didBecomeFirstResponder = [super becomeFirstResponder];
</span><span class="cx"> if (didBecomeFirstResponder)
</span><span class="cx"> [_textSelectionAssistant activateSelection];
</span><span class="lines">@@ -688,6 +692,8 @@
</span><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><ins>+ _isResigningFirstResponder = YES;
+
</ins><span class="cx"> if (!_webView->_activeFocusedStateRetainCount) {
</span><span class="cx"> // We need to complete the editing operation before we blur the element.
</span><span class="cx"> [_inputPeripheral endEditing];
</span><span class="lines">@@ -698,7 +704,11 @@
</span><span class="cx"> [_webSelectionAssistant resignedFirstResponder];
</span><span class="cx"> [_textSelectionAssistant deactivateSelection];
</span><span class="cx">
</span><del>- return [super resignFirstResponder];
</del><ins>+ bool superDidResign = [super resignFirstResponder];
+
+ _isResigningFirstResponder = NO;
+
+ return superDidResign;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if ENABLE(TOUCH_EVENTS)
</span></span></pre>
</div>
</div>
</body>
</html>