<!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>[245154] trunk/Source/WebKit</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/245154">245154</a></dd>
<dt>Author</dt> <dd>dbates@webkit.org</dd>
<dt>Date</dt> <dd>2019-05-09 13:18:44 -0700 (Thu, 09 May 2019)</dd>
</dl>

<h3>Log Message</h3>
<pre>[iOS] Lazily request keyboard on first hardware keydown when a non-editable element is focused
https://bugs.webkit.org/show_bug.cgi?id=197746
<rdar://problem/50630406>

Reviewed by Brent Fulgham.

Be even lazier. We only need to create a keyboard if an editable element is focused or on
the first hardware keydown when a non-editable element is focused. We currently do the former.
Let's also do the latter.

* UIProcess/ios/WKContentViewInteraction.h:
* UIProcess/ios/WKContentViewInteraction.mm:
(-[WKContentView cleanupInteraction]): Reset bookkeeping.
(-[WKContentView _requiresKeyboardWhenFirstResponder]): Further condition the result on
whether we have seen a hardware keydown event in a non-editable element.
(-[WKContentView _handleKeyUIEvent:]): If this is the first hardware key event we've seen then
update state and call -reloadInputView. -reloadInputView will call us back in -_requiresKeyboardWhenFirstResponder
and we will now return YES. So, it will create the keyboard.
(-[WKContentView _hardwareKeyboardAvailabilityChanged]): Reset bookkeeping.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKitChangeLog">trunk/Source/WebKit/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitUIProcessiosWKContentViewInteractionh">trunk/Source/WebKit/UIProcess/ios/WKContentViewInteraction.h</a></li>
<li><a href="#trunkSourceWebKitUIProcessiosWKContentViewInteractionmm">trunk/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKitChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/ChangeLog (245153 => 245154)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/ChangeLog    2019-05-09 19:42:44 UTC (rev 245153)
+++ trunk/Source/WebKit/ChangeLog       2019-05-09 20:18:44 UTC (rev 245154)
</span><span class="lines">@@ -1,3 +1,25 @@
</span><ins>+2019-05-09  Daniel Bates  <dabates@apple.com>
+
+        [iOS] Lazily request keyboard on first hardware keydown when a non-editable element is focused
+        https://bugs.webkit.org/show_bug.cgi?id=197746
+        <rdar://problem/50630406>
+
+        Reviewed by Brent Fulgham.
+
+        Be even lazier. We only need to create a keyboard if an editable element is focused or on
+        the first hardware keydown when a non-editable element is focused. We currently do the former.
+        Let's also do the latter.
+
+        * UIProcess/ios/WKContentViewInteraction.h:
+        * UIProcess/ios/WKContentViewInteraction.mm:
+        (-[WKContentView cleanupInteraction]): Reset bookkeeping.
+        (-[WKContentView _requiresKeyboardWhenFirstResponder]): Further condition the result on
+        whether we have seen a hardware keydown event in a non-editable element.
+        (-[WKContentView _handleKeyUIEvent:]): If this is the first hardware key event we've seen then
+        update state and call -reloadInputView. -reloadInputView will call us back in -_requiresKeyboardWhenFirstResponder
+        and we will now return YES. So, it will create the keyboard.
+        (-[WKContentView _hardwareKeyboardAvailabilityChanged]): Reset bookkeeping.
+
</ins><span class="cx"> 2019-05-08  Dean Jackson  <dino@apple.com>
</span><span class="cx"> 
</span><span class="cx">         Guard long press link preview with a USE macro rather than complicated includes
</span></span></pre></div>
<a id="trunkSourceWebKitUIProcessiosWKContentViewInteractionh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/UIProcess/ios/WKContentViewInteraction.h (245153 => 245154)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/UIProcess/ios/WKContentViewInteraction.h     2019-05-09 19:42:44 UTC (rev 245153)
+++ trunk/Source/WebKit/UIProcess/ios/WKContentViewInteraction.h        2019-05-09 20:18:44 UTC (rev 245154)
</span><span class="lines">@@ -324,6 +324,7 @@
</span><span class="cx"> 
</span><span class="cx"> #if USE(UIKIT_KEYBOARD_ADDITIONS)
</span><span class="cx">     BOOL _candidateViewNeedsUpdate;
</span><ins>+    BOOL _seenHardwareKeyDownInNonEditableElement;
</ins><span class="cx"> #endif
</span><span class="cx"> 
</span><span class="cx">     BOOL _becomingFirstResponder;
</span></span></pre></div>
<a id="trunkSourceWebKitUIProcessiosWKContentViewInteractionmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm (245153 => 245154)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm    2019-05-09 19:42:44 UTC (rev 245153)
+++ trunk/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm       2019-05-09 20:18:44 UTC (rev 245154)
</span><span class="lines">@@ -842,6 +842,7 @@
</span><span class="cx"> 
</span><span class="cx"> #if USE(UIKIT_KEYBOARD_ADDITIONS)
</span><span class="cx">     _candidateViewNeedsUpdate = NO;
</span><ins>+    _seenHardwareKeyDownInNonEditableElement = NO;
</ins><span class="cx"> #endif
</span><span class="cx"> 
</span><span class="cx">     if (_interactionViewsContainerView) {
</span><span class="lines">@@ -1664,14 +1665,12 @@
</span><span class="cx"> 
</span><span class="cx"> - (BOOL)_requiresKeyboardWhenFirstResponder
</span><span class="cx"> {
</span><del>-    // FIXME: Only create keyboard if [self shouldShowAutomaticKeyboardUI] returns YES or
-    // on first hardware keydown in a non-editable element. See <https://bugs.webkit.org/show_bug.cgi?id=197746>.
</del><ins>+    // FIXME: We should add the logic to handle keyboard visibility during focus redirects.
+    return [self shouldShowAutomaticKeyboardUI]
</ins><span class="cx"> #if USE(UIKIT_KEYBOARD_ADDITIONS)
</span><del>-    if (GSEventIsHardwareKeyboardAttached())
-        return YES;
</del><ins>+        || _seenHardwareKeyDownInNonEditableElement
</ins><span class="cx"> #endif
</span><del>-    // FIXME: We should add the logic to handle keyboard visibility during focus redirects.
-    return [self shouldShowAutomaticKeyboardUI];
</del><ins>+        ;
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> - (BOOL)_requiresKeyboardResetOnReload
</span><span class="lines">@@ -4487,6 +4486,10 @@
</span><span class="cx">                 return;
</span><span class="cx">         }
</span><span class="cx"> #if USE(UIKIT_KEYBOARD_ADDITIONS)
</span><ins>+        if (!_seenHardwareKeyDownInNonEditableElement) {
+            _seenHardwareKeyDownInNonEditableElement = YES;
+            [self reloadInputViews];
+        }
</ins><span class="cx">         [super _handleKeyUIEvent:event];
</span><span class="cx"> #else
</span><span class="cx">         [self handleKeyEvent:event];
</span><span class="lines">@@ -5220,6 +5223,9 @@
</span><span class="cx"> 
</span><span class="cx"> - (void)_hardwareKeyboardAvailabilityChanged
</span><span class="cx"> {
</span><ins>+#if USE(UIKIT_KEYBOARD_ADDITIONS)
+    _seenHardwareKeyDownInNonEditableElement = NO;
+#endif
</ins><span class="cx">     [self reloadInputViews];
</span><span class="cx"> }
</span><span class="cx"> 
</span></span></pre>
</div>
</div>

</body>
</html>