Changeset 257740 in webkit

Timestamp:

Mar 2, 2020 2:50:52 PM (4 years ago)

Author:

Megan Gardner

Message:

Add date/time style to macCatalyst
​https://bugs.webkit.org/show_bug.cgi?id=208456

Reviewed by Wenson Hsieh.

Source/WebKit:

Add style flag for date/time pickers on macCatalyst.

• Platform/spi/ios/UIKitSPI.h:
• UIProcess/ios/forms/WKFormInputControl.mm:

(-[WKDateTimePicker datePickerStyle]):
(-[WKDateTimePicker initWithView:datePickerMode:]):

Source/WTF:

• wtf/PlatformHave.h:

Location:

trunk/Source

Files:

• WTF/ChangeLog (modified) (1 diff)
• WTF/wtf/PlatformHave.h (modified) (1 diff)
• WebKit/ChangeLog (modified) (1 diff)
• WebKit/Platform/spi/ios/UIKitSPI.h (modified) (1 diff)
• WebKit/UIProcess/ios/forms/WKFormInputControl.mm (modified) (3 diffs)

trunk/Source/WTF/ChangeLog

@@ +1 @@
+2020-03-02  Megan Gardner  <megan_gardner@apple.com>
+
+        Add date/time style to macCatalyst
+        https://bugs.webkit.org/show_bug.cgi?id=208456
+
+        Reviewed by Wenson Hsieh.
+
+        * wtf/PlatformHave.h:
+
 2020-03-02  Paulo Matos  <pmatos@igalia.com>
 

trunk/Source/WTF/wtf/PlatformHave.h

@@ -480 +480 @@
 #define HAVE_HOVER_GESTURE_RECOGNIZER 1
 #define HAVE_LOOKUP_GESTURE_RECOGNIZER 1
+#define HAVE_UIDATEPICKER_STYLE 1
 #endif
 

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2020-03-02  Megan Gardner  <megan_gardner@apple.com>
+
+        Add date/time style to macCatalyst
+        https://bugs.webkit.org/show_bug.cgi?id=208456
+
+        Reviewed by Wenson Hsieh.
+
+        Add style flag for date/time pickers on macCatalyst.
+
+        * Platform/spi/ios/UIKitSPI.h:
+        * UIProcess/ios/forms/WKFormInputControl.mm:
+        (-[WKDateTimePicker datePickerStyle]):
+        (-[WKDateTimePicker initWithView:datePickerMode:]):
+
 2020-03-02  Said Abou-Hallawa  <sabouhallawa@apple.com>
 

trunk/Source/WebKit/Platform/spi/ios/UIKitSPI.h

@@ -190 +190 @@
 };
 
+#if HAVE(UIDATEPICKER_STYLE)
+typedef NS_ENUM(NSInteger, UIDatePickerStyle) {
+    UIDatePickerStyleAutomatic = 0
+}
+#endif
+
 @interface UIDatePicker ()
 @property (nonatomic, readonly, getter=_contentWidth) CGFloat contentWidth;
+#if HAVE(UIDATEPICKER_STYLE)
+@property (nonatomic, readwrite, assign) UIDatePickerStyle preferredDatePickerStyle;
+#endif
 @end
 

trunk/Source/WebKit/UIProcess/ios/forms/WKFormInputControl.mm

@@ -69 +69 @@
 @end
 
+#if USE(APPLE_INTERNAL_SDK)
+#import <WebKitAdditions/WKFormInputControlAdditions.mm>
+#endif
+
 @implementation WKDateTimePicker
 
@@ -80 +84 @@
     return _datePicker.get();
 }
+
+#if !USE(APPLE_INTERNAL_SDK) && HAVE(UIDATEPICKER_STYLE)
+- (UIDatePickerStyle)datePickerStyle
+{
+    return UIDatePickerStyleAutomatic;
+}
+#endif
 
 - (id)initWithView:(WKContentView *)view datePickerMode:(UIDatePickerMode)mode
@@ -110 +121 @@
 
     _datePicker = adoptNS([[UIDatePicker alloc] initWithFrame:CGRectMake(0, 0, size.width, size.height)]);
+#if HAVE(UIDATEPICKER_STYLE)
+    [_datePicker setPreferredDatePickerStyle:[self datePickerStyle]];
+#endif
     _datePicker.get().datePickerMode = mode;
     _datePicker.get().hidden = NO;