Title: [276395] trunk/Source
- Revision
- 276395
- Author
- [email protected]
- Date
- 2021-04-21 15:59:11 -0700 (Wed, 21 Apr 2021)
Log Message
[iOS] Fix internal builds after r276325
https://bugs.webkit.org/show_bug.cgi?id=224896
Reviewed by Tim Horton.
Source/WebKit:
* UIProcess/ios/forms/WKDateTimeInputControl.mm:
(-[WKDateTimePickerViewController datePickerInsets]):
(-[WKDateTimePicker _contextMenuInteraction:styleForMenuWithConfiguration:]):
Source/WTF:
* wtf/PlatformHave.h:
Modified Paths
Diff
Modified: trunk/Source/WTF/ChangeLog (276394 => 276395)
--- trunk/Source/WTF/ChangeLog 2021-04-21 22:48:38 UTC (rev 276394)
+++ trunk/Source/WTF/ChangeLog 2021-04-21 22:59:11 UTC (rev 276395)
@@ -1,3 +1,12 @@
+2021-04-21 Aditya Keerthi <[email protected]>
+
+ [iOS] Fix internal builds after r276325
+ https://bugs.webkit.org/show_bug.cgi?id=224896
+
+ Reviewed by Tim Horton.
+
+ * wtf/PlatformHave.h:
+
2021-04-21 Martin Robinson <[email protected]>
Enable CSS Scroll Snap by default
Modified: trunk/Source/WTF/wtf/PlatformHave.h (276394 => 276395)
--- trunk/Source/WTF/wtf/PlatformHave.h 2021-04-21 22:48:38 UTC (rev 276394)
+++ trunk/Source/WTF/wtf/PlatformHave.h 2021-04-21 22:59:11 UTC (rev 276395)
@@ -953,3 +953,8 @@
#if PLATFORM(IOS) || PLATFORM(MACCATALYST) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 110000)
#define HAVE_NSURLPROTOCOL_WITH_SKIPAPPSSO 1
#endif
+
+#if (PLATFORM(IOS) || PLATFORM(MACCATALYST)) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 150000
+#define HAVE_UICONTEXTMENU_STYLE_CUSTOM_PRESENTATION 1
+#define HAVE_UIDATEPICKER_INSETS 1
+#endif
Modified: trunk/Source/WebKit/ChangeLog (276394 => 276395)
--- trunk/Source/WebKit/ChangeLog 2021-04-21 22:48:38 UTC (rev 276394)
+++ trunk/Source/WebKit/ChangeLog 2021-04-21 22:59:11 UTC (rev 276395)
@@ -1,5 +1,16 @@
2021-04-21 Aditya Keerthi <[email protected]>
+ [iOS] Fix internal builds after r276325
+ https://bugs.webkit.org/show_bug.cgi?id=224896
+
+ Reviewed by Tim Horton.
+
+ * UIProcess/ios/forms/WKDateTimeInputControl.mm:
+ (-[WKDateTimePickerViewController datePickerInsets]):
+ (-[WKDateTimePicker _contextMenuInteraction:styleForMenuWithConfiguration:]):
+
+2021-04-21 Aditya Keerthi <[email protected]>
+
[iOS][FCR] Update font for group headers in the <select multiple> picker
https://bugs.webkit.org/show_bug.cgi?id=224823
<rdar://problem/76785841>
Modified: trunk/Source/WebKit/UIProcess/ios/forms/WKDateTimeInputControl.mm (276394 => 276395)
--- trunk/Source/WebKit/UIProcess/ios/forms/WKDateTimeInputControl.mm 2021-04-21 22:48:38 UTC (rev 276394)
+++ trunk/Source/WebKit/UIProcess/ios/forms/WKDateTimeInputControl.mm 2021-04-21 22:59:11 UTC (rev 276395)
@@ -175,9 +175,13 @@
- (UIEdgeInsets)datePickerInsets
{
+#if HAVE(UIDATEPICKER_INSETS)
UIEdgeInsets expectedInsets = UIEdgeInsetsMake(kDateTimePickerViewMargin, kDateTimePickerViewMargin, kDateTimePickerViewMargin, kDateTimePickerViewMargin);
UIEdgeInsets appliedInsets = [_datePicker _appliedInsetsToEdgeOfContent];
return UIEdgeInsetsSubtract(expectedInsets, appliedInsets, UIRectEdgeAll);
+#else
+ return UIEdgeInsetsZero;
+#endif
}
- (CGSize)preferredDatePickerSize
@@ -395,9 +399,11 @@
style.hasInteractivePreview = YES;
style.preferredBackgroundEffects = @[ [UIVisualEffect emptyEffect] ];
style.preferredLayout = _UIContextMenuLayoutPreviewOnly;
+#if HAVE(UICONTEXTMENU_STYLE_CUSTOM_PRESENTATION)
style.prefersCenteredPreviewWhenActionsAreAbsent = NO;
style.ignoresDefaultSizingRules = YES;
style.preferredEdgeInsets = [self _preferredEdgeInsetsForDateTimePicker];
+#endif
return style;
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
