<!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>[278731] 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/278731">278731</a></dd>
<dt>Author</dt> <dd>akeerthi@apple.com</dd>
<dt>Date</dt> <dd>2021-06-10 14:03:00 -0700 (Thu, 10 Jun 2021)</dd>
</dl>

<h3>Log Message</h3>
<pre>[iOS] VinylWall app crashes when tapping on 'format' dropdown menu in 'Add Record' menu
https://bugs.webkit.org/show_bug.cgi?id=226886
<rdar://problem/77207322>

Reviewed by Tim Horton.

The VinylWall app contains a WKWebView, and uses <select> to let users
choose options. With the new form controls on iOS, tapping on a <select>
presents a UIContextMenuInteraction, rather than a picker wheel or
popover. However, UIContextMenuInteraction is not supported on apps
linked against an SDK older than iOS 14, resulting in this crash.

To fix, perform a linked-on-or-after check before showing the new UI
for <select> and <input type=text> with a <datalist>. If the check
fails, fallback to the old UI. We already have this check in place for
other context menus in `-[WKContentView _shouldUseContextMenus]`, so we
reuse that method.

* UIProcess/ios/WKContentViewInteraction.h:
* UIProcess/ios/WKContentViewInteraction.mm:
(-[WKContentView _shouldShowAutomaticKeyboardUIIgnoringInputMode]):
(-[WKContentView _elementTypeRequiresAccessoryView:]):
(-[WKContentView _shouldUseContextMenusForFormControls]):
* UIProcess/ios/WebDataListSuggestionsDropdownIOS.mm:
(WebKit::WebDataListSuggestionsDropdownIOS::show):
* UIProcess/ios/forms/WKFormSelectControl.mm:
(-[WKFormSelectControl initWithView:]):</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>
<li><a href="#trunkSourceWebKitUIProcessiosWebDataListSuggestionsDropdownIOSmm">trunk/Source/WebKit/UIProcess/ios/WebDataListSuggestionsDropdownIOS.mm</a></li>
<li><a href="#trunkSourceWebKitUIProcessiosformsWKFormSelectControlmm">trunk/Source/WebKit/UIProcess/ios/forms/WKFormSelectControl.mm</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKitChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/ChangeLog (278730 => 278731)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/ChangeLog    2021-06-10 20:56:57 UTC (rev 278730)
+++ trunk/Source/WebKit/ChangeLog       2021-06-10 21:03:00 UTC (rev 278731)
</span><span class="lines">@@ -1,3 +1,33 @@
</span><ins>+2021-06-10  Aditya Keerthi  <akeerthi@apple.com>
+
+        [iOS] VinylWall app crashes when tapping on 'format' dropdown menu in 'Add Record' menu
+        https://bugs.webkit.org/show_bug.cgi?id=226886
+        <rdar://problem/77207322>
+
+        Reviewed by Tim Horton.
+
+        The VinylWall app contains a WKWebView, and uses <select> to let users
+        choose options. With the new form controls on iOS, tapping on a <select>
+        presents a UIContextMenuInteraction, rather than a picker wheel or
+        popover. However, UIContextMenuInteraction is not supported on apps
+        linked against an SDK older than iOS 14, resulting in this crash.
+
+        To fix, perform a linked-on-or-after check before showing the new UI
+        for <select> and <input type=text> with a <datalist>. If the check
+        fails, fallback to the old UI. We already have this check in place for
+        other context menus in `-[WKContentView _shouldUseContextMenus]`, so we
+        reuse that method.
+
+        * UIProcess/ios/WKContentViewInteraction.h:
+        * UIProcess/ios/WKContentViewInteraction.mm:
+        (-[WKContentView _shouldShowAutomaticKeyboardUIIgnoringInputMode]):
+        (-[WKContentView _elementTypeRequiresAccessoryView:]):
+        (-[WKContentView _shouldUseContextMenusForFormControls]):
+        * UIProcess/ios/WebDataListSuggestionsDropdownIOS.mm:
+        (WebKit::WebDataListSuggestionsDropdownIOS::show):
+        * UIProcess/ios/forms/WKFormSelectControl.mm:
+        (-[WKFormSelectControl initWithView:]):
+
</ins><span class="cx"> 2021-06-10  Tim Horton  <timothy_horton@apple.com>
</span><span class="cx"> 
</span><span class="cx">         REGRESSION (r277820): Trackpad interaction in Web Content is not working on iOS or macCatalyst
</span></span></pre></div>
<a id="trunkSourceWebKitUIProcessiosWKContentViewInteractionh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/UIProcess/ios/WKContentViewInteraction.h (278730 => 278731)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/UIProcess/ios/WKContentViewInteraction.h     2021-06-10 20:56:57 UTC (rev 278730)
+++ trunk/Source/WebKit/UIProcess/ios/WKContentViewInteraction.h        2021-06-10 21:03:00 UTC (rev 278731)
</span><span class="lines">@@ -696,6 +696,7 @@
</span><span class="cx"> - (void)clearTextIndicator:(WebCore::TextIndicatorDismissalAnimation)animation;
</span><span class="cx"> 
</span><span class="cx"> @property (nonatomic, readonly) BOOL _shouldUseContextMenus;
</span><ins>+@property (nonatomic, readonly) BOOL _shouldUseContextMenusForFormControls;
</ins><span class="cx"> @property (nonatomic, readonly) BOOL _shouldAvoidResizingWhenInputViewBoundsChange;
</span><span class="cx"> @property (nonatomic, readonly) BOOL _shouldAvoidScrollingWhenFocusedContentIsVisible;
</span><span class="cx"> @property (nonatomic, readonly) BOOL _shouldUseLegacySelectPopoverDismissalBehavior;
</span></span></pre></div>
<a id="trunkSourceWebKitUIProcessiosWKContentViewInteractionmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm (278730 => 278731)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm    2021-06-10 20:56:57 UTC (rev 278730)
+++ trunk/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm       2021-06-10 21:03:00 UTC (rev 278731)
</span><span class="lines">@@ -2190,7 +2190,7 @@
</span><span class="cx">         return NO;
</span><span class="cx">     case WebKit::InputType::Select: {
</span><span class="cx"> #if ENABLE(IOS_FORM_CONTROL_REFRESH)
</span><del>-        if ([self _formControlRefreshEnabled])
</del><ins>+        if (self._shouldUseContextMenusForFormControls)
</ins><span class="cx">             return NO;
</span><span class="cx"> #endif
</span><span class="cx">         return !WebKit::currentUserInterfaceIdiomIsPadOrMac();
</span><span class="lines">@@ -3263,7 +3263,7 @@
</span><span class="cx">         return false;
</span><span class="cx">     case WebKit::InputType::Select: {
</span><span class="cx"> #if ENABLE(IOS_FORM_CONTROL_REFRESH)
</span><del>-        if ([self _formControlRefreshEnabled])
</del><ins>+        if (self._shouldUseContextMenusForFormControls)
</ins><span class="cx">             return NO;
</span><span class="cx"> #endif
</span><span class="cx">         return !WebKit::currentUserInterfaceIdiomIsPadOrMac();
</span><span class="lines">@@ -7652,6 +7652,14 @@
</span><span class="cx">     return NO;
</span><span class="cx"> }
</span><span class="cx"> 
</span><ins>+- (BOOL)_shouldUseContextMenusForFormControls
+{
+#if ENABLE(IOS_FORM_CONTROL_REFRESH)
+    return self._formControlRefreshEnabled && self._shouldUseContextMenus;
+#endif
+    return NO;
+}
+
</ins><span class="cx"> - (BOOL)_shouldAvoidResizingWhenInputViewBoundsChange
</span><span class="cx"> {
</span><span class="cx">     return _focusedElementInformation.shouldAvoidResizingWhenInputViewBoundsChange;
</span></span></pre></div>
<a id="trunkSourceWebKitUIProcessiosWebDataListSuggestionsDropdownIOSmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/UIProcess/ios/WebDataListSuggestionsDropdownIOS.mm (278730 => 278731)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/UIProcess/ios/WebDataListSuggestionsDropdownIOS.mm   2021-06-10 20:56:57 UTC (rev 278730)
+++ trunk/Source/WebKit/UIProcess/ios/WebDataListSuggestionsDropdownIOS.mm      2021-06-10 21:03:00 UTC (rev 278731)
</span><span class="lines">@@ -109,7 +109,7 @@
</span><span class="cx">     WebCore::DataListSuggestionActivationType type = information.activationType;
</span><span class="cx"> 
</span><span class="cx"> #if ENABLE(IOS_FORM_CONTROL_REFRESH)
</span><del>-    if ([m_contentView _formControlRefreshEnabled]) {
</del><ins>+    if (m_contentView._shouldUseContextMenusForFormControls) {
</ins><span class="cx">         m_suggestionsControl = adoptNS([[WKDataListSuggestionsDropdown alloc] initWithInformation:WTFMove(information) inView:m_contentView]);
</span><span class="cx">         [m_suggestionsControl showSuggestionsDropdown:*this activationType:type];
</span><span class="cx">         return;
</span></span></pre></div>
<a id="trunkSourceWebKitUIProcessiosformsWKFormSelectControlmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/UIProcess/ios/forms/WKFormSelectControl.mm (278730 => 278731)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/UIProcess/ios/forms/WKFormSelectControl.mm   2021-06-10 20:56:57 UTC (rev 278730)
+++ trunk/Source/WebKit/UIProcess/ios/forms/WKFormSelectControl.mm      2021-06-10 21:03:00 UTC (rev 278731)
</span><span class="lines">@@ -76,7 +76,7 @@
</span><span class="cx">     RetainPtr<NSObject <WKFormControl>> control;
</span><span class="cx"> 
</span><span class="cx"> #if ENABLE(IOS_FORM_CONTROL_REFRESH)
</span><del>-    if ([view _formControlRefreshEnabled]) {
</del><ins>+    if (view._shouldUseContextMenusForFormControls) {
</ins><span class="cx">         if (view.focusedElementInformation.isMultiSelect)
</span><span class="cx">             control = adoptNS([[WKSelectMultiplePicker alloc] initWithView:view]);
</span><span class="cx">         else
</span></span></pre>
</div>
</div>

</body>
</html>