<!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>[281278] trunk/Source</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/281278">281278</a></dd>
<dt>Author</dt> <dd>akeerthi@apple.com</dd>
<dt>Date</dt> <dd>2021-08-19 16:13:51 -0700 (Thu, 19 Aug 2021)</dd>
</dl>

<h3>Log Message</h3>
<pre>Remove __has_include guard for _UIDatePickerOverlayPresentation
https://bugs.webkit.org/show_bug.cgi?id=227298
rdar://79970171

Reviewed by Tim Horton.

Source/WebKit:

* Platform/spi/ios/UIKitSPI.h:
* UIProcess/ios/forms/WKDateTimeInputControl.mm:
(-[WKDateTimePicker showDateTimePicker]):

Source/WTF:

* wtf/PlatformHave.h:</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWTFChangeLog">trunk/Source/WTF/ChangeLog</a></li>
<li><a href="#trunkSourceWTFwtfPlatformHaveh">trunk/Source/WTF/wtf/PlatformHave.h</a></li>
<li><a href="#trunkSourceWebKitChangeLog">trunk/Source/WebKit/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitPlatformspiiosUIKitSPIh">trunk/Source/WebKit/Platform/spi/ios/UIKitSPI.h</a></li>
<li><a href="#trunkSourceWebKitUIProcessiosformsWKDateTimeInputControlmm">trunk/Source/WebKit/UIProcess/ios/forms/WKDateTimeInputControl.mm</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWTFChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/ChangeLog (281277 => 281278)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/ChangeLog       2021-08-19 23:02:50 UTC (rev 281277)
+++ trunk/Source/WTF/ChangeLog  2021-08-19 23:13:51 UTC (rev 281278)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2021-08-19  Aditya Keerthi  <akeerthi@apple.com>
+
+        Remove __has_include guard for _UIDatePickerOverlayPresentation
+        https://bugs.webkit.org/show_bug.cgi?id=227298
+        rdar://79970171
+
+        Reviewed by Tim Horton.
+
+        * wtf/PlatformHave.h:
+
</ins><span class="cx"> 2021-08-19  David Kilzer  <ddkilzer@apple.com>
</span><span class="cx"> 
</span><span class="cx">         [WTF] Fix static analyzer warnings for clang tidy bugprone-move-forwarding-reference checker
</span></span></pre></div>
<a id="trunkSourceWTFwtfPlatformHaveh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/PlatformHave.h (281277 => 281278)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/PlatformHave.h      2021-08-19 23:02:50 UTC (rev 281277)
+++ trunk/Source/WTF/wtf/PlatformHave.h 2021-08-19 23:13:51 UTC (rev 281278)
</span><span class="lines">@@ -1038,6 +1038,7 @@
</span><span class="cx"> #if (PLATFORM(IOS) || PLATFORM(MACCATALYST)) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 150000
</span><span class="cx"> #define HAVE_UICONTEXTMENU_STYLE_CUSTOM_PRESENTATION 1
</span><span class="cx"> #define HAVE_UIDATEPICKER_INSETS 1
</span><ins>+#define HAVE_UIDATEPICKER_OVERLAY_PRESENTATION 1
</ins><span class="cx"> #define HAVE_UIMENUOPTIONS_SINGLE_SELECTION 1
</span><span class="cx"> #endif
</span><span class="cx"> 
</span><span class="lines">@@ -1086,11 +1087,6 @@
</span><span class="cx"> #define HAVE_QUICKLOOK_PREVIEW_ACTIVITY 1
</span><span class="cx"> #endif
</span><span class="cx"> 
</span><del>-// FIXME: Replace the __has_include check with a version check once internal bots are updated (webkit.org/b/227298).
-#if PLATFORM(IOS_FAMILY) && defined __has_include && __has_include(<UIKit/_UIDatePickerOverlayPresentation.h>)
-#define HAVE_UIDATEPICKER_OVERLAY_PRESENTATION 1
-#endif
-
</del><span class="cx"> #if PLATFORM(IOS) || PLATFORM(MACCATALYST)
</span><span class="cx"> #define HAVE_UITOOLBAR_STANDARD_APPEARANCE 1
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebKitChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/ChangeLog (281277 => 281278)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/ChangeLog    2021-08-19 23:02:50 UTC (rev 281277)
+++ trunk/Source/WebKit/ChangeLog       2021-08-19 23:13:51 UTC (rev 281278)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2021-08-19  Aditya Keerthi  <akeerthi@apple.com>
+
+        Remove __has_include guard for _UIDatePickerOverlayPresentation
+        https://bugs.webkit.org/show_bug.cgi?id=227298
+        rdar://79970171
+
+        Reviewed by Tim Horton.
+
+        * Platform/spi/ios/UIKitSPI.h:
+        * UIProcess/ios/forms/WKDateTimeInputControl.mm:
+        (-[WKDateTimePicker showDateTimePicker]):
+
</ins><span class="cx"> 2021-08-19  Alex Christensen  <achristensen@webkit.org>
</span><span class="cx"> 
</span><span class="cx">         Use Vector<SandboxExtension::Handle> instead of SandboxExtension::HandleArray
</span></span></pre></div>
<a id="trunkSourceWebKitPlatformspiiosUIKitSPIh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/Platform/spi/ios/UIKitSPI.h (281277 => 281278)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/Platform/spi/ios/UIKitSPI.h  2021-08-19 23:02:50 UTC (rev 281277)
+++ trunk/Source/WebKit/Platform/spi/ios/UIKitSPI.h     2021-08-19 23:13:51 UTC (rev 281278)
</span><span class="lines">@@ -108,6 +108,10 @@
</span><span class="cx"> #import <UIKit/UIContextMenuInteraction_Private.h>
</span><span class="cx"> #endif
</span><span class="cx"> 
</span><ins>+#if HAVE(UIDATEPICKER_OVERLAY_PRESENTATION)
+#import <UIKit/_UIDatePickerOverlayPresentation.h>
+#endif
+
</ins><span class="cx"> #if ENABLE(DRAG_SUPPORT)
</span><span class="cx"> #import <UIKit/NSItemProvider+UIKitAdditions_Private.h>
</span><span class="cx"> #endif
</span><span class="lines">@@ -222,6 +226,28 @@
</span><span class="cx"> - (UIEdgeInsets)_appliedInsetsToEdgeOfContent;
</span><span class="cx"> @end
</span><span class="cx"> 
</span><ins>+#if HAVE(UIDATEPICKER_OVERLAY_PRESENTATION)
+
+typedef NS_ENUM(NSInteger, _UIDatePickerOverlayAnchor) {
+    _UIDatePickerOverlayAnchorSourceRect = 2
+};
+
+@interface _UIDatePickerOverlayPresentation : NSObject
+
+- (instancetype)initWithSourceView:(UIView *)sourceView;
+- (void)presentDatePicker:(UIDatePicker *)datePicker onDismiss:(void(^)(BOOL retargeted))dismissHandler;
+- (void)dismissPresentationAnimated:(BOOL)animated;
+
+@property (nonatomic, weak, readonly) UIView *sourceView;
+@property (nonatomic, assign) CGRect sourceRect;
+@property (nonatomic, assign) _UIDatePickerOverlayAnchor overlayAnchor;
+@property (nonatomic, strong) UIView *accessoryView;
+@property (nonatomic, assign) BOOL accessoryViewIgnoresDefaultInsets;
+
+@end
+
+#endif
+
</ins><span class="cx"> @interface UIDevice ()
</span><span class="cx"> - (void)setOrientation:(UIDeviceOrientation)orientation animated:(BOOL)animated;
</span><span class="cx"> @property (nonatomic, readonly, retain) NSString *buildVersion;
</span><span class="lines">@@ -1454,30 +1480,6 @@
</span><span class="cx"> @end
</span><span class="cx"> #endif
</span><span class="cx"> 
</span><del>-#if HAVE(UIDATEPICKER_OVERLAY_PRESENTATION)
-
-// FIXME: Import the header directly once bots are updated to a build containing rdar://78779655.
-
-typedef NS_ENUM(NSInteger, _UIDatePickerOverlayAnchor) {
-    _UIDatePickerOverlayAnchorSourceRect = 2
-};
-
-@interface _UIDatePickerOverlayPresentation : NSObject
-
-- (instancetype)initWithSourceView:(UIView *)sourceView;
-- (void)presentDatePicker:(UIDatePicker *)datePicker onDismiss:(void(^)(BOOL retargeted))dismissHandler;
-- (void)dismissPresentationAnimated:(BOOL)animated;
-
-@property (nonatomic, weak, readonly) UIView *sourceView;
-@property (nonatomic, assign) CGRect sourceRect;
-@property (nonatomic, assign) _UIDatePickerOverlayAnchor overlayAnchor;
-@property (nonatomic, strong) UIView *accessoryView;
-@property (nonatomic, assign) BOOL accessoryViewIgnoresDefaultInsets;
-
-@end
-
-#endif
-
</del><span class="cx"> WTF_EXTERN_C_BEGIN
</span><span class="cx"> 
</span><span class="cx"> BOOL UIKeyboardEnabledInputModesAllowOneToManyShortcuts(void);
</span></span></pre></div>
<a id="trunkSourceWebKitUIProcessiosformsWKDateTimeInputControlmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/UIProcess/ios/forms/WKDateTimeInputControl.mm (281277 => 281278)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/UIProcess/ios/forms/WKDateTimeInputControl.mm        2021-08-19 23:02:50 UTC (rev 281277)
+++ trunk/Source/WebKit/UIProcess/ios/forms/WKDateTimeInputControl.mm   2021-08-19 23:13:51 UTC (rev 281278)
</span><span class="lines">@@ -501,10 +501,8 @@
</span><span class="cx">     [_datePickerPresentation setSourceRect:_view.focusedElementInformation.interactionRect];
</span><span class="cx">     [_datePickerPresentation setAccessoryView:_accessoryView.get()];
</span><span class="cx">     [_datePickerPresentation setAccessoryViewIgnoresDefaultInsets:YES];
</span><ins>+    [_datePickerPresentation setOverlayAnchor:_UIDatePickerOverlayAnchorSourceRect];
</ins><span class="cx"> 
</span><del>-    if ([_datePickerPresentation respondsToSelector:@selector(setOverlayAnchor:)])
-        [_datePickerPresentation setOverlayAnchor:_UIDatePickerOverlayAnchorSourceRect];
-
</del><span class="cx">     [_datePickerPresentation presentDatePicker:_datePicker.get() onDismiss:[weakSelf = WeakObjCPtr<WKDateTimePicker>(self)](BOOL) {
</span><span class="cx">         if (auto strongSelf = weakSelf.get())
</span><span class="cx">             [strongSelf handleDatePickerPresentationDismissal];
</span></span></pre>
</div>
</div>

</body>
</html>