Title: [263549] trunk/Source/WebKit
- Revision
- 263549
- Author
- [email protected]
- Date
- 2020-06-25 19:47:16 -0700 (Thu, 25 Jun 2020)
Log Message
Upstream date/time picker style
https://bugs.webkit.org/show_bug.cgi?id=213630
Reviewed by Wenson Hsieh.
* UIProcess/ios/forms/WKDateTimeInputControl.mm:
(-[WKDateTimePicker datePickerStyle]):
Modified Paths
Diff
Modified: trunk/Source/WebKit/ChangeLog (263548 => 263549)
--- trunk/Source/WebKit/ChangeLog 2020-06-26 01:03:22 UTC (rev 263548)
+++ trunk/Source/WebKit/ChangeLog 2020-06-26 02:47:16 UTC (rev 263549)
@@ -1,3 +1,13 @@
+2020-06-25 Megan Gardner <[email protected]>
+
+ Upstream date/time picker style
+ https://bugs.webkit.org/show_bug.cgi?id=213630
+
+ Reviewed by Wenson Hsieh.
+
+ * UIProcess/ios/forms/WKDateTimeInputControl.mm:
+ (-[WKDateTimePicker datePickerStyle]):
+
2020-06-25 Chris Dumez <[email protected]>
Unreviewed, reverting r263545.
Modified: trunk/Source/WebKit/UIProcess/ios/forms/WKDateTimeInputControl.mm (263548 => 263549)
--- trunk/Source/WebKit/UIProcess/ios/forms/WKDateTimeInputControl.mm 2020-06-26 01:03:22 UTC (rev 263548)
+++ trunk/Source/WebKit/UIProcess/ios/forms/WKDateTimeInputControl.mm 2020-06-26 02:47:16 UTC (rev 263549)
@@ -70,11 +70,6 @@
- (void)setHour:(NSInteger)hour minute:(NSInteger)minute;
@end
-#if USE(APPLE_INTERNAL_SDK)
-#import <WebKitAdditions/WKFormInputControlAdditions.mm>
-#endif
-
-
@implementation WKDateTimeContextMenuViewController
- (CGSize)preferredContentSize
@@ -100,10 +95,12 @@
static NSString * const kTimeFormatString = @"HH:mm"; // "13:45".
static const NSTimeInterval kMillisecondsPerSecond = 1000;
-#if !USE(APPLE_INTERNAL_SDK) && HAVE(UIDATEPICKER_STYLE)
+#if HAVE(UIDATEPICKER_STYLE)
- (UIDatePickerStyle)datePickerStyle
{
- return UIDatePickerStyleAutomatic;
+ if ([_view focusedElementInformation].elementType == WebKit::InputType::Month)
+ return UIDatePickerStyleWheels;
+ return UIDatePickerStyleInline;
}
#endif
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
