<!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>[281989] trunk</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/281989">281989</a></dd>
<dt>Author</dt> <dd>wenson_hsieh@apple.com</dd>
<dt>Date</dt> <dd>2021-09-03 06:55:11 -0700 (Fri, 03 Sep 2021)</dd>
</dl>

<h3>Log Message</h3>
<pre>[iOS 15] editing/caret/ios/caret-in-overflow-area.html is failing
https://bugs.webkit.org/show_bug.cgi?id=229830
rdar://82190832

Reviewed by Tim Horton.

Source/WebKit:

See Tools/ChangeLog for more details.

* Platform/spi/ios/TextInputSPI.h:

Tools:

In iOS 15, writing the "AutomaticMinimizationEnabled" default is no longer sufficient to ensure that only the
UCB is on-screen when the keyboard is shown after focusing an editable element with the hardware keyboard
attached in layout tests. Among other things, this causes editing/caret/ios/caret-in-overflow-area.html to fail
in newly created iOS simulators, or iOS simulators that have just had their content erased, due to the fact that
the full-height software keyboard is shown instead of the minimized UCB.

Address this by updating the workaround such that we directly call into TextInput SPI to enable automatic
keyboard minimization.

* WebKitTestRunner/ios/TestControllerIOS.mm:
(WTR::TestController::platformResetStateToConsistentValues):</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKitChangeLog">trunk/Source/WebKit/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitPlatformspiiosTextInputSPIh">trunk/Source/WebKit/Platform/spi/ios/TextInputSPI.h</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsWebKitTestRunneriosTestControllerIOSmm">trunk/Tools/WebKitTestRunner/ios/TestControllerIOS.mm</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKitChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/ChangeLog (281988 => 281989)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/ChangeLog    2021-09-03 13:28:06 UTC (rev 281988)
+++ trunk/Source/WebKit/ChangeLog       2021-09-03 13:55:11 UTC (rev 281989)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2021-09-03  Wenson Hsieh  <wenson_hsieh@apple.com>
+
+        [iOS 15] editing/caret/ios/caret-in-overflow-area.html is failing
+        https://bugs.webkit.org/show_bug.cgi?id=229830
+        rdar://82190832
+
+        Reviewed by Tim Horton.
+
+        See Tools/ChangeLog for more details.
+
+        * Platform/spi/ios/TextInputSPI.h:
+
</ins><span class="cx"> 2021-09-03  David Kilzer  <ddkilzer@apple.com>
</span><span class="cx"> 
</span><span class="cx">         RemoteVideoSample needs CVPixelBufferRef to be kept alive, but relies on caller to retain it
</span></span></pre></div>
<a id="trunkSourceWebKitPlatformspiiosTextInputSPIh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/Platform/spi/ios/TextInputSPI.h (281988 => 281989)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/Platform/spi/ios/TextInputSPI.h      2021-09-03 13:28:06 UTC (rev 281988)
+++ trunk/Source/WebKit/Platform/spi/ios/TextInputSPI.h 2021-09-03 13:55:11 UTC (rev 281989)
</span><span class="lines">@@ -41,10 +41,15 @@
</span><span class="cx"> @end
</span><span class="cx"> 
</span><span class="cx"> @protocol TIPreferencesControllerActions <NSObject>
</span><ins>+@property (nonatomic) BOOL automaticMinimizationEnabled;
</ins><span class="cx"> - (BOOL)oneTimeActionCompleted:(NSString *)actionKey;
</span><span class="cx"> - (void)didTriggerOneTimeAction:(NSString *)actionKey;
</span><span class="cx"> @end
</span><span class="cx"> 
</span><ins>+@interface TIPreferencesController : NSObject <TIPreferencesControllerActions>
++ (instancetype)sharedPreferencesController;
+@end
+
</ins><span class="cx"> @interface NSString (TextInputDetails)
</span><span class="cx"> - (BOOL)_containsCJScripts;
</span><span class="cx"> - (BOOL)_containsCJScriptsOnly;
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (281988 => 281989)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog    2021-09-03 13:28:06 UTC (rev 281988)
+++ trunk/Tools/ChangeLog       2021-09-03 13:55:11 UTC (rev 281989)
</span><span class="lines">@@ -1,3 +1,23 @@
</span><ins>+2021-09-03  Wenson Hsieh  <wenson_hsieh@apple.com>
+
+        [iOS 15] editing/caret/ios/caret-in-overflow-area.html is failing
+        https://bugs.webkit.org/show_bug.cgi?id=229830
+        rdar://82190832
+
+        Reviewed by Tim Horton.
+
+        In iOS 15, writing the "AutomaticMinimizationEnabled" default is no longer sufficient to ensure that only the
+        UCB is on-screen when the keyboard is shown after focusing an editable element with the hardware keyboard
+        attached in layout tests. Among other things, this causes editing/caret/ios/caret-in-overflow-area.html to fail
+        in newly created iOS simulators, or iOS simulators that have just had their content erased, due to the fact that
+        the full-height software keyboard is shown instead of the minimized UCB.
+
+        Address this by updating the workaround such that we directly call into TextInput SPI to enable automatic
+        keyboard minimization.
+
+        * WebKitTestRunner/ios/TestControllerIOS.mm:
+        (WTR::TestController::platformResetStateToConsistentValues):
+
</ins><span class="cx"> 2021-09-03  Youenn Fablet  <youenn@apple.com>
</span><span class="cx"> 
</span><span class="cx">         Remove all WTR output before Content-Type:text/plain for WebRTC tests on BigSur
</span></span></pre></div>
<a id="trunkToolsWebKitTestRunneriosTestControllerIOSmm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/WebKitTestRunner/ios/TestControllerIOS.mm (281988 => 281989)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/WebKitTestRunner/ios/TestControllerIOS.mm    2021-09-03 13:28:06 UTC (rev 281988)
+++ trunk/Tools/WebKitTestRunner/ios/TestControllerIOS.mm       2021-09-03 13:55:11 UTC (rev 281989)
</span><span class="lines">@@ -47,7 +47,11 @@
</span><span class="cx"> #import <objc/runtime.h>
</span><span class="cx"> #import <pal/spi/ios/GraphicsServicesSPI.h>
</span><span class="cx"> #import <wtf/MainThread.h>
</span><ins>+#import <wtf/SoftLinking.h>
</ins><span class="cx"> 
</span><ins>+SOFT_LINK_PRIVATE_FRAMEWORK(TextInput)
+SOFT_LINK_CLASS(TextInput, TIPreferencesController);
+
</ins><span class="cx"> static void overrideSyncInputManagerToAcceptedAutocorrection(id, SEL, TIKeyboardCandidate *candidate, TIKeyboardInput *input)
</span><span class="cx"> {
</span><span class="cx">     // Intentionally unimplemented. See usage below for more information.
</span><span class="lines">@@ -153,14 +157,13 @@
</span><span class="cx">     [UIPasteboard generalPasteboard].items = @[ ];
</span><span class="cx">     [[UIApplication sharedApplication] _cancelAllTouches];
</span><span class="cx">     [[UIDevice currentDevice] setOrientation:UIDeviceOrientationPortrait animated:NO];
</span><ins>+
+    // Ensures that only the UCB is on-screen when showing the keyboard, if the hardware keyboard is attached.
+    TIPreferencesController *textInputPreferences = [getTIPreferencesControllerClass() sharedPreferencesController];
+    if (!textInputPreferences.automaticMinimizationEnabled)
+        textInputPreferences.automaticMinimizationEnabled = YES;
+
</ins><span class="cx">     UIKeyboardPreferencesController *keyboardPreferences = UIKeyboardPreferencesController.sharedPreferencesController;
</span><del>-    auto globalPreferencesDomainName = CFSTR("com.apple.Preferences");
-    auto automaticMinimizationEnabledPreferenceKey = @"AutomaticMinimizationEnabled";
-    if (![keyboardPreferences boolForPreferenceKey:automaticMinimizationEnabledPreferenceKey]) {
-        [keyboardPreferences setValue:@YES forPreferenceKey:automaticMinimizationEnabledPreferenceKey];
-        CFPreferencesSetAppValue((__bridge CFStringRef)automaticMinimizationEnabledPreferenceKey, kCFBooleanTrue, globalPreferencesDomainName);
-    }
-
</del><span class="cx">     // Ensures that changing selection does not cause the software keyboard to appear,
</span><span class="cx">     // even when the hardware keyboard is attached.
</span><span class="cx">     auto hardwareKeyboardLastSeenPreferenceKey = @"HardwareKeyboardLastSeen";
</span><span class="lines">@@ -177,7 +180,7 @@
</span><span class="cx">     auto dictationKeyboardShortcutValueForTesting = @(-1);
</span><span class="cx">     if (![dictationKeyboardShortcutValueForTesting isEqual:[keyboardPreferences valueForPreferenceKey:dictationKeyboardShortcutPreferenceKey]]) {
</span><span class="cx">         [keyboardPreferences setValue:dictationKeyboardShortcutValueForTesting forPreferenceKey:dictationKeyboardShortcutPreferenceKey];
</span><del>-        CFPreferencesSetAppValue((__bridge CFStringRef)dictationKeyboardShortcutPreferenceKey, (__bridge CFNumberRef)dictationKeyboardShortcutValueForTesting, globalPreferencesDomainName);
</del><ins>+        CFPreferencesSetAppValue((__bridge CFStringRef)dictationKeyboardShortcutPreferenceKey, (__bridge CFNumberRef)dictationKeyboardShortcutValueForTesting, CFSTR("com.apple.Preferences"));
</ins><span class="cx">     }
</span><span class="cx"> 
</span><span class="cx">     GSEventSetHardwareKeyboardAttached(true, 0);
</span></span></pre>
</div>
</div>

</body>
</html>