Attachment 368263 Details for Bug 197287 – Patch

[patch] Patch

bug-197287-20190425134657.patch (text/plain), 24.31 KB, created by Timothy Hatcher on 2019-04-25 13:46:57 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Timothy Hatcher

Created: 2019-04-25 13:46:57 PDT

Size: 24.31 KB

patch

obsolete

>Subversion Revision: 244602
>diff --git a/Source/JavaScriptCore/ChangeLog b/Source/JavaScriptCore/ChangeLog
>index 53e375bca44fe93b6818d7621757437cd5dec58d..6b8d7f32c795992586c436ed3d809e19a4ba9bc6 100644
>--- a/Source/JavaScriptCore/ChangeLog
>+++ b/Source/JavaScriptCore/ChangeLog
>@@ -1,3 +1,13 @@
>+2019-04-25  Timothy Hatcher  <timothy@apple.com>
>+
>+        Disable date and time inputs on iOSMac.
>+        https://bugs.webkit.org/show_bug.cgi?id=197287
>+        rdar://problem/46794376
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * Configurations/FeatureDefines.xcconfig:
>+
> 2019-04-23  Yusuke Suzuki  <ysuzuki@apple.com>
> 
>         [JSC] Shrink DFG::MinifiedNode
>diff --git a/Source/WTF/ChangeLog b/Source/WTF/ChangeLog
>index c38d2720280615f53f1c985692f811f6efd3bd9b..471238f661fae3d1257e81614f7f6c456d249446 100644
>--- a/Source/WTF/ChangeLog
>+++ b/Source/WTF/ChangeLog
>@@ -1,3 +1,13 @@
>+2019-04-25  Timothy Hatcher  <timothy@apple.com>
>+
>+        Disable date and time inputs on iOSMac.
>+        https://bugs.webkit.org/show_bug.cgi?id=197287
>+        rdar://problem/46794376
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * wtf/FeatureDefines.h:
>+
> 2019-04-24  Tim Horton  <timothy_horton@apple.com>
> 
>         Clean up WKActionSheetAssistant's use of LaunchServices
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index 6e9bbe17d2bd5747253c5d924d52be6104df65f9..5c5a631f956faa97a9d6b980991f6d8e7a6b391f 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,16 @@
>+2019-04-25  Timothy Hatcher  <timothy@apple.com>
>+
>+        Disable date and time inputs on iOSMac.
>+        https://bugs.webkit.org/show_bug.cgi?id=197287
>+        rdar://problem/46794376
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * Configurations/FeatureDefines.xcconfig:
>+        * platform/text/mac/LocaleMac.h:
>+        * platform/text/mac/LocaleMac.mm:
>+        (WebCore::LocaleMac::formatDateTime):
>+
> 2019-04-24  Simon Fraser  <simon.fraser@apple.com>
> 
>         Make it possible to control the renderTreeAsText output by setting options on testRunner
>diff --git a/Source/WebCore/PAL/ChangeLog b/Source/WebCore/PAL/ChangeLog
>index ce265c2e0df86ae04eba05725eb5b4fe92636d88..9da66cfdfe41d6389a26eb0d11f870b4b160666c 100644
>--- a/Source/WebCore/PAL/ChangeLog
>+++ b/Source/WebCore/PAL/ChangeLog
>@@ -1,3 +1,13 @@
>+2019-04-25  Timothy Hatcher  <timothy@apple.com>
>+
>+        Disable date and time inputs on iOSMac.
>+        https://bugs.webkit.org/show_bug.cgi?id=197287
>+        rdar://problem/46794376
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * Configurations/FeatureDefines.xcconfig:
>+
> 2019-04-24  Tim Horton  <timothy_horton@apple.com>
> 
>         Clean up WKActionSheetAssistant's use of LaunchServices
>diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
>index 8e8baa819fb15ff8805961b54001600a3251bea7..70e050b731970ee69c43296701551281092b06e3 100644
>--- a/Source/WebKit/ChangeLog
>+++ b/Source/WebKit/ChangeLog
>@@ -1,3 +1,13 @@
>+2019-04-25  Timothy Hatcher  <timothy@apple.com>
>+
>+        Disable date and time inputs on iOSMac.
>+        https://bugs.webkit.org/show_bug.cgi?id=197287
>+        rdar://problem/46794376
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * Configurations/FeatureDefines.xcconfig:
>+
> 2019-04-24  Wenson Hsieh  <wenson_hsieh@apple.com>
> 
>         Plumb the navigation's request when determining recommended compatibility mode
>diff --git a/Source/WebKitLegacy/mac/ChangeLog b/Source/WebKitLegacy/mac/ChangeLog
>index a851852714062973526373448488a0bf5a63fcee..ac35519d6ae672de00f28d975923320eb2574687 100644
>--- a/Source/WebKitLegacy/mac/ChangeLog
>+++ b/Source/WebKitLegacy/mac/ChangeLog
>@@ -1,3 +1,13 @@
>+2019-04-25  Timothy Hatcher  <timothy@apple.com>
>+
>+        Disable date and time inputs on iOSMac.
>+        https://bugs.webkit.org/show_bug.cgi?id=197287
>+        rdar://problem/46794376
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * Configurations/FeatureDefines.xcconfig:
>+
> 2019-04-24  Simon Fraser  <simon.fraser@apple.com>
> 
>         Make it possible to control the renderTreeAsText output by setting options on testRunner
>diff --git a/Source/JavaScriptCore/Configurations/FeatureDefines.xcconfig b/Source/JavaScriptCore/Configurations/FeatureDefines.xcconfig
>index 2c801cf3ddc51648179add0105a1b1eb193ff455..9e11c6785fae3b0ceb78b4a29a7239b81494ebb8 100644
>--- a/Source/JavaScriptCore/Configurations/FeatureDefines.xcconfig
>+++ b/Source/JavaScriptCore/Configurations/FeatureDefines.xcconfig
>@@ -201,22 +201,37 @@ ENABLE_INDEXED_DATABASE_IN_WORKERS = ENABLE_INDEXED_DATABASE_IN_WORKERS;
> 
> ENABLE_INPUT_TYPE_COLOR = ENABLE_INPUT_TYPE_COLOR;
> 
>-ENABLE_INPUT_TYPE_DATETIMELOCAL = $(ENABLE_INPUT_TYPE_DATETIMELOCAL_$(WK_COCOA_TOUCH));
>-ENABLE_INPUT_TYPE_DATETIMELOCAL_cocoatouch = ENABLE_INPUT_TYPE_DATETIMELOCAL;
>+ENABLE_INPUT_TYPE_DATETIMELOCAL = $(ENABLE_INPUT_TYPE_DATETIMELOCAL_$(WK_PLATFORM_NAME));
>+ENABLE_INPUT_TYPE_DATETIMELOCAL_iphoneos = ENABLE_INPUT_TYPE_DATETIMELOCAL;
>+ENABLE_INPUT_TYPE_DATETIMELOCAL_iphonesimulator = ENABLE_INPUT_TYPE_DATETIMELOCAL;
>+ENABLE_INPUT_TYPE_DATETIMELOCAL_watchos = ENABLE_INPUT_TYPE_DATETIMELOCAL;
>+ENABLE_INPUT_TYPE_DATETIMELOCAL_watchsimulator = ENABLE_INPUT_TYPE_DATETIMELOCAL;
> 
> ENABLE_INPUT_TYPE_DATETIME_INCOMPLETE = ;
> 
>-ENABLE_INPUT_TYPE_DATE = $(ENABLE_INPUT_TYPE_DATE_$(WK_COCOA_TOUCH));
>-ENABLE_INPUT_TYPE_DATE_cocoatouch = ENABLE_INPUT_TYPE_DATE;
>-
>-ENABLE_INPUT_TYPE_MONTH = $(ENABLE_INPUT_TYPE_MONTH_$(WK_COCOA_TOUCH));
>-ENABLE_INPUT_TYPE_MONTH_cocoatouch = ENABLE_INPUT_TYPE_MONTH;
>-
>-ENABLE_INPUT_TYPE_TIME = $(ENABLE_INPUT_TYPE_TIME_$(WK_COCOA_TOUCH));
>-ENABLE_INPUT_TYPE_TIME_cocoatouch = ENABLE_INPUT_TYPE_TIME;
>-
>-ENABLE_INPUT_TYPE_WEEK = $(ENABLE_INPUT_TYPE_WEEK_$(WK_COCOA_TOUCH));
>-ENABLE_INPUT_TYPE_WEEK_cocoatouch = ENABLE_INPUT_TYPE_WEEK;
>+ENABLE_INPUT_TYPE_DATE = $(ENABLE_INPUT_TYPE_DATE_$(WK_PLATFORM_NAME));
>+ENABLE_INPUT_TYPE_DATE_iphoneos = ENABLE_INPUT_TYPE_DATE;
>+ENABLE_INPUT_TYPE_DATE_iphonesimulator = ENABLE_INPUT_TYPE_DATE;
>+ENABLE_INPUT_TYPE_DATE_watchos = ENABLE_INPUT_TYPE_DATE;
>+ENABLE_INPUT_TYPE_DATE_watchsimulator = ENABLE_INPUT_TYPE_DATE;
>+
>+ENABLE_INPUT_TYPE_MONTH = $(ENABLE_INPUT_TYPE_MONTH_$(WK_PLATFORM_NAME));
>+ENABLE_INPUT_TYPE_MONTH_iphoneos = ENABLE_INPUT_TYPE_MONTH;
>+ENABLE_INPUT_TYPE_MONTH_iphonesimulator = ENABLE_INPUT_TYPE_MONTH;
>+ENABLE_INPUT_TYPE_MONTH_watchos = ENABLE_INPUT_TYPE_MONTH;
>+ENABLE_INPUT_TYPE_MONTH_watchsimulator = ENABLE_INPUT_TYPE_MONTH;
>+
>+ENABLE_INPUT_TYPE_TIME = $(ENABLE_INPUT_TYPE_TIME_$(WK_PLATFORM_NAME));
>+ENABLE_INPUT_TYPE_TIME_iphoneos = ENABLE_INPUT_TYPE_TIME;
>+ENABLE_INPUT_TYPE_TIME_iphonesimulator = ENABLE_INPUT_TYPE_TIME;
>+ENABLE_INPUT_TYPE_TIME_watchos = ENABLE_INPUT_TYPE_TIME;
>+ENABLE_INPUT_TYPE_TIME_watchsimulator = ENABLE_INPUT_TYPE_TIME;
>+
>+ENABLE_INPUT_TYPE_WEEK = $(ENABLE_INPUT_TYPE_WEEK_$(WK_PLATFORM_NAME));
>+ENABLE_INPUT_TYPE_WEEK_iphoneos = ENABLE_INPUT_TYPE_WEEK;
>+ENABLE_INPUT_TYPE_WEEK_iphonesimulator = ENABLE_INPUT_TYPE_WEEK;
>+ENABLE_INPUT_TYPE_WEEK_watchos = ENABLE_INPUT_TYPE_WEEK;
>+ENABLE_INPUT_TYPE_WEEK_watchsimulator = ENABLE_INPUT_TYPE_WEEK;
> 
> ENABLE_INSPECTOR_ALTERNATE_DISPATCHERS = ENABLE_INSPECTOR_ALTERNATE_DISPATCHERS;
> 
>diff --git a/Source/WebCore/Configurations/FeatureDefines.xcconfig b/Source/WebCore/Configurations/FeatureDefines.xcconfig
>index 2c801cf3ddc51648179add0105a1b1eb193ff455..9e11c6785fae3b0ceb78b4a29a7239b81494ebb8 100644
>--- a/Source/WebCore/Configurations/FeatureDefines.xcconfig
>+++ b/Source/WebCore/Configurations/FeatureDefines.xcconfig
>@@ -201,22 +201,37 @@ ENABLE_INDEXED_DATABASE_IN_WORKERS = ENABLE_INDEXED_DATABASE_IN_WORKERS;
> 
> ENABLE_INPUT_TYPE_COLOR = ENABLE_INPUT_TYPE_COLOR;
> 
>-ENABLE_INPUT_TYPE_DATETIMELOCAL = $(ENABLE_INPUT_TYPE_DATETIMELOCAL_$(WK_COCOA_TOUCH));
>-ENABLE_INPUT_TYPE_DATETIMELOCAL_cocoatouch = ENABLE_INPUT_TYPE_DATETIMELOCAL;
>+ENABLE_INPUT_TYPE_DATETIMELOCAL = $(ENABLE_INPUT_TYPE_DATETIMELOCAL_$(WK_PLATFORM_NAME));
>+ENABLE_INPUT_TYPE_DATETIMELOCAL_iphoneos = ENABLE_INPUT_TYPE_DATETIMELOCAL;
>+ENABLE_INPUT_TYPE_DATETIMELOCAL_iphonesimulator = ENABLE_INPUT_TYPE_DATETIMELOCAL;
>+ENABLE_INPUT_TYPE_DATETIMELOCAL_watchos = ENABLE_INPUT_TYPE_DATETIMELOCAL;
>+ENABLE_INPUT_TYPE_DATETIMELOCAL_watchsimulator = ENABLE_INPUT_TYPE_DATETIMELOCAL;
> 
> ENABLE_INPUT_TYPE_DATETIME_INCOMPLETE = ;
> 
>-ENABLE_INPUT_TYPE_DATE = $(ENABLE_INPUT_TYPE_DATE_$(WK_COCOA_TOUCH));
>-ENABLE_INPUT_TYPE_DATE_cocoatouch = ENABLE_INPUT_TYPE_DATE;
>-
>-ENABLE_INPUT_TYPE_MONTH = $(ENABLE_INPUT_TYPE_MONTH_$(WK_COCOA_TOUCH));
>-ENABLE_INPUT_TYPE_MONTH_cocoatouch = ENABLE_INPUT_TYPE_MONTH;
>-
>-ENABLE_INPUT_TYPE_TIME = $(ENABLE_INPUT_TYPE_TIME_$(WK_COCOA_TOUCH));
>-ENABLE_INPUT_TYPE_TIME_cocoatouch = ENABLE_INPUT_TYPE_TIME;
>-
>-ENABLE_INPUT_TYPE_WEEK = $(ENABLE_INPUT_TYPE_WEEK_$(WK_COCOA_TOUCH));
>-ENABLE_INPUT_TYPE_WEEK_cocoatouch = ENABLE_INPUT_TYPE_WEEK;
>+ENABLE_INPUT_TYPE_DATE = $(ENABLE_INPUT_TYPE_DATE_$(WK_PLATFORM_NAME));
>+ENABLE_INPUT_TYPE_DATE_iphoneos = ENABLE_INPUT_TYPE_DATE;
>+ENABLE_INPUT_TYPE_DATE_iphonesimulator = ENABLE_INPUT_TYPE_DATE;
>+ENABLE_INPUT_TYPE_DATE_watchos = ENABLE_INPUT_TYPE_DATE;
>+ENABLE_INPUT_TYPE_DATE_watchsimulator = ENABLE_INPUT_TYPE_DATE;
>+
>+ENABLE_INPUT_TYPE_MONTH = $(ENABLE_INPUT_TYPE_MONTH_$(WK_PLATFORM_NAME));
>+ENABLE_INPUT_TYPE_MONTH_iphoneos = ENABLE_INPUT_TYPE_MONTH;
>+ENABLE_INPUT_TYPE_MONTH_iphonesimulator = ENABLE_INPUT_TYPE_MONTH;
>+ENABLE_INPUT_TYPE_MONTH_watchos = ENABLE_INPUT_TYPE_MONTH;
>+ENABLE_INPUT_TYPE_MONTH_watchsimulator = ENABLE_INPUT_TYPE_MONTH;
>+
>+ENABLE_INPUT_TYPE_TIME = $(ENABLE_INPUT_TYPE_TIME_$(WK_PLATFORM_NAME));
>+ENABLE_INPUT_TYPE_TIME_iphoneos = ENABLE_INPUT_TYPE_TIME;
>+ENABLE_INPUT_TYPE_TIME_iphonesimulator = ENABLE_INPUT_TYPE_TIME;
>+ENABLE_INPUT_TYPE_TIME_watchos = ENABLE_INPUT_TYPE_TIME;
>+ENABLE_INPUT_TYPE_TIME_watchsimulator = ENABLE_INPUT_TYPE_TIME;
>+
>+ENABLE_INPUT_TYPE_WEEK = $(ENABLE_INPUT_TYPE_WEEK_$(WK_PLATFORM_NAME));
>+ENABLE_INPUT_TYPE_WEEK_iphoneos = ENABLE_INPUT_TYPE_WEEK;
>+ENABLE_INPUT_TYPE_WEEK_iphonesimulator = ENABLE_INPUT_TYPE_WEEK;
>+ENABLE_INPUT_TYPE_WEEK_watchos = ENABLE_INPUT_TYPE_WEEK;
>+ENABLE_INPUT_TYPE_WEEK_watchsimulator = ENABLE_INPUT_TYPE_WEEK;
> 
> ENABLE_INSPECTOR_ALTERNATE_DISPATCHERS = ENABLE_INSPECTOR_ALTERNATE_DISPATCHERS;
> 
>diff --git a/Source/WebCore/PAL/Configurations/FeatureDefines.xcconfig b/Source/WebCore/PAL/Configurations/FeatureDefines.xcconfig
>index 2c801cf3ddc51648179add0105a1b1eb193ff455..9e11c6785fae3b0ceb78b4a29a7239b81494ebb8 100644
>--- a/Source/WebCore/PAL/Configurations/FeatureDefines.xcconfig
>+++ b/Source/WebCore/PAL/Configurations/FeatureDefines.xcconfig
>@@ -201,22 +201,37 @@ ENABLE_INDEXED_DATABASE_IN_WORKERS = ENABLE_INDEXED_DATABASE_IN_WORKERS;
> 
> ENABLE_INPUT_TYPE_COLOR = ENABLE_INPUT_TYPE_COLOR;
> 
>-ENABLE_INPUT_TYPE_DATETIMELOCAL = $(ENABLE_INPUT_TYPE_DATETIMELOCAL_$(WK_COCOA_TOUCH));
>-ENABLE_INPUT_TYPE_DATETIMELOCAL_cocoatouch = ENABLE_INPUT_TYPE_DATETIMELOCAL;
>+ENABLE_INPUT_TYPE_DATETIMELOCAL = $(ENABLE_INPUT_TYPE_DATETIMELOCAL_$(WK_PLATFORM_NAME));
>+ENABLE_INPUT_TYPE_DATETIMELOCAL_iphoneos = ENABLE_INPUT_TYPE_DATETIMELOCAL;
>+ENABLE_INPUT_TYPE_DATETIMELOCAL_iphonesimulator = ENABLE_INPUT_TYPE_DATETIMELOCAL;
>+ENABLE_INPUT_TYPE_DATETIMELOCAL_watchos = ENABLE_INPUT_TYPE_DATETIMELOCAL;
>+ENABLE_INPUT_TYPE_DATETIMELOCAL_watchsimulator = ENABLE_INPUT_TYPE_DATETIMELOCAL;
> 
> ENABLE_INPUT_TYPE_DATETIME_INCOMPLETE = ;
> 
>-ENABLE_INPUT_TYPE_DATE = $(ENABLE_INPUT_TYPE_DATE_$(WK_COCOA_TOUCH));
>-ENABLE_INPUT_TYPE_DATE_cocoatouch = ENABLE_INPUT_TYPE_DATE;
>-
>-ENABLE_INPUT_TYPE_MONTH = $(ENABLE_INPUT_TYPE_MONTH_$(WK_COCOA_TOUCH));
>-ENABLE_INPUT_TYPE_MONTH_cocoatouch = ENABLE_INPUT_TYPE_MONTH;
>-
>-ENABLE_INPUT_TYPE_TIME = $(ENABLE_INPUT_TYPE_TIME_$(WK_COCOA_TOUCH));
>-ENABLE_INPUT_TYPE_TIME_cocoatouch = ENABLE_INPUT_TYPE_TIME;
>-
>-ENABLE_INPUT_TYPE_WEEK = $(ENABLE_INPUT_TYPE_WEEK_$(WK_COCOA_TOUCH));
>-ENABLE_INPUT_TYPE_WEEK_cocoatouch = ENABLE_INPUT_TYPE_WEEK;
>+ENABLE_INPUT_TYPE_DATE = $(ENABLE_INPUT_TYPE_DATE_$(WK_PLATFORM_NAME));
>+ENABLE_INPUT_TYPE_DATE_iphoneos = ENABLE_INPUT_TYPE_DATE;
>+ENABLE_INPUT_TYPE_DATE_iphonesimulator = ENABLE_INPUT_TYPE_DATE;
>+ENABLE_INPUT_TYPE_DATE_watchos = ENABLE_INPUT_TYPE_DATE;
>+ENABLE_INPUT_TYPE_DATE_watchsimulator = ENABLE_INPUT_TYPE_DATE;
>+
>+ENABLE_INPUT_TYPE_MONTH = $(ENABLE_INPUT_TYPE_MONTH_$(WK_PLATFORM_NAME));
>+ENABLE_INPUT_TYPE_MONTH_iphoneos = ENABLE_INPUT_TYPE_MONTH;
>+ENABLE_INPUT_TYPE_MONTH_iphonesimulator = ENABLE_INPUT_TYPE_MONTH;
>+ENABLE_INPUT_TYPE_MONTH_watchos = ENABLE_INPUT_TYPE_MONTH;
>+ENABLE_INPUT_TYPE_MONTH_watchsimulator = ENABLE_INPUT_TYPE_MONTH;
>+
>+ENABLE_INPUT_TYPE_TIME = $(ENABLE_INPUT_TYPE_TIME_$(WK_PLATFORM_NAME));
>+ENABLE_INPUT_TYPE_TIME_iphoneos = ENABLE_INPUT_TYPE_TIME;
>+ENABLE_INPUT_TYPE_TIME_iphonesimulator = ENABLE_INPUT_TYPE_TIME;
>+ENABLE_INPUT_TYPE_TIME_watchos = ENABLE_INPUT_TYPE_TIME;
>+ENABLE_INPUT_TYPE_TIME_watchsimulator = ENABLE_INPUT_TYPE_TIME;
>+
>+ENABLE_INPUT_TYPE_WEEK = $(ENABLE_INPUT_TYPE_WEEK_$(WK_PLATFORM_NAME));
>+ENABLE_INPUT_TYPE_WEEK_iphoneos = ENABLE_INPUT_TYPE_WEEK;
>+ENABLE_INPUT_TYPE_WEEK_iphonesimulator = ENABLE_INPUT_TYPE_WEEK;
>+ENABLE_INPUT_TYPE_WEEK_watchos = ENABLE_INPUT_TYPE_WEEK;
>+ENABLE_INPUT_TYPE_WEEK_watchsimulator = ENABLE_INPUT_TYPE_WEEK;
> 
> ENABLE_INSPECTOR_ALTERNATE_DISPATCHERS = ENABLE_INSPECTOR_ALTERNATE_DISPATCHERS;
> 
>diff --git a/Source/WebCore/platform/text/mac/LocaleMac.h b/Source/WebCore/platform/text/mac/LocaleMac.h
>index b3019647310e2c916dbf38fdc5d4d358727cc8e2..be091acca63f077bdf7d74104480db58370e31c4 100644
>--- a/Source/WebCore/platform/text/mac/LocaleMac.h
>+++ b/Source/WebCore/platform/text/mac/LocaleMac.h
>@@ -50,11 +50,9 @@ public:
>     explicit LocaleMac(NSLocale*);
>     ~LocaleMac();
> 
>-#if PLATFORM(IOS_FAMILY)
>+#if ENABLE(DATE_AND_TIME_INPUT_TYPES)
>     String formatDateTime(const DateComponents&, FormatType = FormatTypeUnspecified) override;
>-#endif
> 
>-#if ENABLE(DATE_AND_TIME_INPUT_TYPES)
>     String dateFormat() override;
>     String monthFormat() override;
>     String shortMonthFormat() override;
>diff --git a/Source/WebCore/platform/text/mac/LocaleMac.mm b/Source/WebCore/platform/text/mac/LocaleMac.mm
>index 0b4a4da8ae2879ad1ea55a4e55b06a9c2f1eb3e5..ef5537ad6f8073ca46d453ffa7e73095e14f338e 100644
>--- a/Source/WebCore/platform/text/mac/LocaleMac.mm
>+++ b/Source/WebCore/platform/text/mac/LocaleMac.mm
>@@ -103,7 +103,7 @@ RetainPtr<NSDateFormatter> LocaleMac::shortDateFormatter()
>     return createDateTimeFormatter(m_locale.get(), m_gregorianCalendar.get(), NSDateFormatterShortStyle, NSDateFormatterNoStyle);
> }
> 
>-#if PLATFORM(IOS_FAMILY)
>+#if ENABLE(DATE_AND_TIME_INPUT_TYPES)
> String LocaleMac::formatDateTime(const DateComponents& dateComponents, FormatType)
> {
>     double msec = dateComponents.millisecondsSinceEpoch();
>@@ -122,9 +122,6 @@ String LocaleMac::formatDateTime(const DateComponents& dateComponents, FormatTyp
>     NSDateFormatter *dateFormatter = localizedDateCache().formatterForDateType(type);
>     return [dateFormatter stringFromDate:date];
> }
>-#endif
>-
>-#if ENABLE(DATE_AND_TIME_INPUT_TYPES)
> 
> const Vector<String>& LocaleMac::monthLabels()
> {
>diff --git a/Source/WebKit/Configurations/FeatureDefines.xcconfig b/Source/WebKit/Configurations/FeatureDefines.xcconfig
>index 2c801cf3ddc51648179add0105a1b1eb193ff455..9e11c6785fae3b0ceb78b4a29a7239b81494ebb8 100644
>--- a/Source/WebKit/Configurations/FeatureDefines.xcconfig
>+++ b/Source/WebKit/Configurations/FeatureDefines.xcconfig
>@@ -201,22 +201,37 @@ ENABLE_INDEXED_DATABASE_IN_WORKERS = ENABLE_INDEXED_DATABASE_IN_WORKERS;
> 
> ENABLE_INPUT_TYPE_COLOR = ENABLE_INPUT_TYPE_COLOR;
> 
>-ENABLE_INPUT_TYPE_DATETIMELOCAL = $(ENABLE_INPUT_TYPE_DATETIMELOCAL_$(WK_COCOA_TOUCH));
>-ENABLE_INPUT_TYPE_DATETIMELOCAL_cocoatouch = ENABLE_INPUT_TYPE_DATETIMELOCAL;
>+ENABLE_INPUT_TYPE_DATETIMELOCAL = $(ENABLE_INPUT_TYPE_DATETIMELOCAL_$(WK_PLATFORM_NAME));
>+ENABLE_INPUT_TYPE_DATETIMELOCAL_iphoneos = ENABLE_INPUT_TYPE_DATETIMELOCAL;
>+ENABLE_INPUT_TYPE_DATETIMELOCAL_iphonesimulator = ENABLE_INPUT_TYPE_DATETIMELOCAL;
>+ENABLE_INPUT_TYPE_DATETIMELOCAL_watchos = ENABLE_INPUT_TYPE_DATETIMELOCAL;
>+ENABLE_INPUT_TYPE_DATETIMELOCAL_watchsimulator = ENABLE_INPUT_TYPE_DATETIMELOCAL;
> 
> ENABLE_INPUT_TYPE_DATETIME_INCOMPLETE = ;
> 
>-ENABLE_INPUT_TYPE_DATE = $(ENABLE_INPUT_TYPE_DATE_$(WK_COCOA_TOUCH));
>-ENABLE_INPUT_TYPE_DATE_cocoatouch = ENABLE_INPUT_TYPE_DATE;
>-
>-ENABLE_INPUT_TYPE_MONTH = $(ENABLE_INPUT_TYPE_MONTH_$(WK_COCOA_TOUCH));
>-ENABLE_INPUT_TYPE_MONTH_cocoatouch = ENABLE_INPUT_TYPE_MONTH;
>-
>-ENABLE_INPUT_TYPE_TIME = $(ENABLE_INPUT_TYPE_TIME_$(WK_COCOA_TOUCH));
>-ENABLE_INPUT_TYPE_TIME_cocoatouch = ENABLE_INPUT_TYPE_TIME;
>-
>-ENABLE_INPUT_TYPE_WEEK = $(ENABLE_INPUT_TYPE_WEEK_$(WK_COCOA_TOUCH));
>-ENABLE_INPUT_TYPE_WEEK_cocoatouch = ENABLE_INPUT_TYPE_WEEK;
>+ENABLE_INPUT_TYPE_DATE = $(ENABLE_INPUT_TYPE_DATE_$(WK_PLATFORM_NAME));
>+ENABLE_INPUT_TYPE_DATE_iphoneos = ENABLE_INPUT_TYPE_DATE;
>+ENABLE_INPUT_TYPE_DATE_iphonesimulator = ENABLE_INPUT_TYPE_DATE;
>+ENABLE_INPUT_TYPE_DATE_watchos = ENABLE_INPUT_TYPE_DATE;
>+ENABLE_INPUT_TYPE_DATE_watchsimulator = ENABLE_INPUT_TYPE_DATE;
>+
>+ENABLE_INPUT_TYPE_MONTH = $(ENABLE_INPUT_TYPE_MONTH_$(WK_PLATFORM_NAME));
>+ENABLE_INPUT_TYPE_MONTH_iphoneos = ENABLE_INPUT_TYPE_MONTH;
>+ENABLE_INPUT_TYPE_MONTH_iphonesimulator = ENABLE_INPUT_TYPE_MONTH;
>+ENABLE_INPUT_TYPE_MONTH_watchos = ENABLE_INPUT_TYPE_MONTH;
>+ENABLE_INPUT_TYPE_MONTH_watchsimulator = ENABLE_INPUT_TYPE_MONTH;
>+
>+ENABLE_INPUT_TYPE_TIME = $(ENABLE_INPUT_TYPE_TIME_$(WK_PLATFORM_NAME));
>+ENABLE_INPUT_TYPE_TIME_iphoneos = ENABLE_INPUT_TYPE_TIME;
>+ENABLE_INPUT_TYPE_TIME_iphonesimulator = ENABLE_INPUT_TYPE_TIME;
>+ENABLE_INPUT_TYPE_TIME_watchos = ENABLE_INPUT_TYPE_TIME;
>+ENABLE_INPUT_TYPE_TIME_watchsimulator = ENABLE_INPUT_TYPE_TIME;
>+
>+ENABLE_INPUT_TYPE_WEEK = $(ENABLE_INPUT_TYPE_WEEK_$(WK_PLATFORM_NAME));
>+ENABLE_INPUT_TYPE_WEEK_iphoneos = ENABLE_INPUT_TYPE_WEEK;
>+ENABLE_INPUT_TYPE_WEEK_iphonesimulator = ENABLE_INPUT_TYPE_WEEK;
>+ENABLE_INPUT_TYPE_WEEK_watchos = ENABLE_INPUT_TYPE_WEEK;
>+ENABLE_INPUT_TYPE_WEEK_watchsimulator = ENABLE_INPUT_TYPE_WEEK;
> 
> ENABLE_INSPECTOR_ALTERNATE_DISPATCHERS = ENABLE_INSPECTOR_ALTERNATE_DISPATCHERS;
> 
>diff --git a/Source/WebKitLegacy/mac/Configurations/FeatureDefines.xcconfig b/Source/WebKitLegacy/mac/Configurations/FeatureDefines.xcconfig
>index 2c801cf3ddc51648179add0105a1b1eb193ff455..9e11c6785fae3b0ceb78b4a29a7239b81494ebb8 100644
>--- a/Source/WebKitLegacy/mac/Configurations/FeatureDefines.xcconfig
>+++ b/Source/WebKitLegacy/mac/Configurations/FeatureDefines.xcconfig
>@@ -201,22 +201,37 @@ ENABLE_INDEXED_DATABASE_IN_WORKERS = ENABLE_INDEXED_DATABASE_IN_WORKERS;
> 
> ENABLE_INPUT_TYPE_COLOR = ENABLE_INPUT_TYPE_COLOR;
> 
>-ENABLE_INPUT_TYPE_DATETIMELOCAL = $(ENABLE_INPUT_TYPE_DATETIMELOCAL_$(WK_COCOA_TOUCH));
>-ENABLE_INPUT_TYPE_DATETIMELOCAL_cocoatouch = ENABLE_INPUT_TYPE_DATETIMELOCAL;
>+ENABLE_INPUT_TYPE_DATETIMELOCAL = $(ENABLE_INPUT_TYPE_DATETIMELOCAL_$(WK_PLATFORM_NAME));
>+ENABLE_INPUT_TYPE_DATETIMELOCAL_iphoneos = ENABLE_INPUT_TYPE_DATETIMELOCAL;
>+ENABLE_INPUT_TYPE_DATETIMELOCAL_iphonesimulator = ENABLE_INPUT_TYPE_DATETIMELOCAL;
>+ENABLE_INPUT_TYPE_DATETIMELOCAL_watchos = ENABLE_INPUT_TYPE_DATETIMELOCAL;
>+ENABLE_INPUT_TYPE_DATETIMELOCAL_watchsimulator = ENABLE_INPUT_TYPE_DATETIMELOCAL;
> 
> ENABLE_INPUT_TYPE_DATETIME_INCOMPLETE = ;
> 
>-ENABLE_INPUT_TYPE_DATE = $(ENABLE_INPUT_TYPE_DATE_$(WK_COCOA_TOUCH));
>-ENABLE_INPUT_TYPE_DATE_cocoatouch = ENABLE_INPUT_TYPE_DATE;
>-
>-ENABLE_INPUT_TYPE_MONTH = $(ENABLE_INPUT_TYPE_MONTH_$(WK_COCOA_TOUCH));
>-ENABLE_INPUT_TYPE_MONTH_cocoatouch = ENABLE_INPUT_TYPE_MONTH;
>-
>-ENABLE_INPUT_TYPE_TIME = $(ENABLE_INPUT_TYPE_TIME_$(WK_COCOA_TOUCH));
>-ENABLE_INPUT_TYPE_TIME_cocoatouch = ENABLE_INPUT_TYPE_TIME;
>-
>-ENABLE_INPUT_TYPE_WEEK = $(ENABLE_INPUT_TYPE_WEEK_$(WK_COCOA_TOUCH));
>-ENABLE_INPUT_TYPE_WEEK_cocoatouch = ENABLE_INPUT_TYPE_WEEK;
>+ENABLE_INPUT_TYPE_DATE = $(ENABLE_INPUT_TYPE_DATE_$(WK_PLATFORM_NAME));
>+ENABLE_INPUT_TYPE_DATE_iphoneos = ENABLE_INPUT_TYPE_DATE;
>+ENABLE_INPUT_TYPE_DATE_iphonesimulator = ENABLE_INPUT_TYPE_DATE;
>+ENABLE_INPUT_TYPE_DATE_watchos = ENABLE_INPUT_TYPE_DATE;
>+ENABLE_INPUT_TYPE_DATE_watchsimulator = ENABLE_INPUT_TYPE_DATE;
>+
>+ENABLE_INPUT_TYPE_MONTH = $(ENABLE_INPUT_TYPE_MONTH_$(WK_PLATFORM_NAME));
>+ENABLE_INPUT_TYPE_MONTH_iphoneos = ENABLE_INPUT_TYPE_MONTH;
>+ENABLE_INPUT_TYPE_MONTH_iphonesimulator = ENABLE_INPUT_TYPE_MONTH;
>+ENABLE_INPUT_TYPE_MONTH_watchos = ENABLE_INPUT_TYPE_MONTH;
>+ENABLE_INPUT_TYPE_MONTH_watchsimulator = ENABLE_INPUT_TYPE_MONTH;
>+
>+ENABLE_INPUT_TYPE_TIME = $(ENABLE_INPUT_TYPE_TIME_$(WK_PLATFORM_NAME));
>+ENABLE_INPUT_TYPE_TIME_iphoneos = ENABLE_INPUT_TYPE_TIME;
>+ENABLE_INPUT_TYPE_TIME_iphonesimulator = ENABLE_INPUT_TYPE_TIME;
>+ENABLE_INPUT_TYPE_TIME_watchos = ENABLE_INPUT_TYPE_TIME;
>+ENABLE_INPUT_TYPE_TIME_watchsimulator = ENABLE_INPUT_TYPE_TIME;
>+
>+ENABLE_INPUT_TYPE_WEEK = $(ENABLE_INPUT_TYPE_WEEK_$(WK_PLATFORM_NAME));
>+ENABLE_INPUT_TYPE_WEEK_iphoneos = ENABLE_INPUT_TYPE_WEEK;
>+ENABLE_INPUT_TYPE_WEEK_iphonesimulator = ENABLE_INPUT_TYPE_WEEK;
>+ENABLE_INPUT_TYPE_WEEK_watchos = ENABLE_INPUT_TYPE_WEEK;
>+ENABLE_INPUT_TYPE_WEEK_watchsimulator = ENABLE_INPUT_TYPE_WEEK;
> 
> ENABLE_INSPECTOR_ALTERNATE_DISPATCHERS = ENABLE_INSPECTOR_ALTERNATE_DISPATCHERS;
> 
>diff --git a/Tools/ChangeLog b/Tools/ChangeLog
>index ef968238db2d3927ba041410fbf3a4beedff379b..d1e15e655c05a962526e3bdf90b743a13acb815b 100644
>--- a/Tools/ChangeLog
>+++ b/Tools/ChangeLog
>@@ -1,3 +1,13 @@
>+2019-04-25  Timothy Hatcher  <timothy@apple.com>
>+
>+        Disable date and time inputs on iOSMac.
>+        https://bugs.webkit.org/show_bug.cgi?id=197287
>+        rdar://problem/46794376
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * TestWebKitAPI/Configurations/FeatureDefines.xcconfig:
>+
> 2019-04-24  Simon Fraser  <simon.fraser@apple.com>
> 
>         Make it possible to control the renderTreeAsText output by setting options on testRunner
>diff --git a/Tools/TestWebKitAPI/Configurations/FeatureDefines.xcconfig b/Tools/TestWebKitAPI/Configurations/FeatureDefines.xcconfig
>index 2c801cf3ddc51648179add0105a1b1eb193ff455..9e11c6785fae3b0ceb78b4a29a7239b81494ebb8 100644
>--- a/Tools/TestWebKitAPI/Configurations/FeatureDefines.xcconfig
>+++ b/Tools/TestWebKitAPI/Configurations/FeatureDefines.xcconfig
>@@ -201,22 +201,37 @@ ENABLE_INDEXED_DATABASE_IN_WORKERS = ENABLE_INDEXED_DATABASE_IN_WORKERS;
> 
> ENABLE_INPUT_TYPE_COLOR = ENABLE_INPUT_TYPE_COLOR;
> 
>-ENABLE_INPUT_TYPE_DATETIMELOCAL = $(ENABLE_INPUT_TYPE_DATETIMELOCAL_$(WK_COCOA_TOUCH));
>-ENABLE_INPUT_TYPE_DATETIMELOCAL_cocoatouch = ENABLE_INPUT_TYPE_DATETIMELOCAL;
>+ENABLE_INPUT_TYPE_DATETIMELOCAL = $(ENABLE_INPUT_TYPE_DATETIMELOCAL_$(WK_PLATFORM_NAME));
>+ENABLE_INPUT_TYPE_DATETIMELOCAL_iphoneos = ENABLE_INPUT_TYPE_DATETIMELOCAL;
>+ENABLE_INPUT_TYPE_DATETIMELOCAL_iphonesimulator = ENABLE_INPUT_TYPE_DATETIMELOCAL;
>+ENABLE_INPUT_TYPE_DATETIMELOCAL_watchos = ENABLE_INPUT_TYPE_DATETIMELOCAL;
>+ENABLE_INPUT_TYPE_DATETIMELOCAL_watchsimulator = ENABLE_INPUT_TYPE_DATETIMELOCAL;
> 
> ENABLE_INPUT_TYPE_DATETIME_INCOMPLETE = ;
> 
>-ENABLE_INPUT_TYPE_DATE = $(ENABLE_INPUT_TYPE_DATE_$(WK_COCOA_TOUCH));
>-ENABLE_INPUT_TYPE_DATE_cocoatouch = ENABLE_INPUT_TYPE_DATE;
>-
>-ENABLE_INPUT_TYPE_MONTH = $(ENABLE_INPUT_TYPE_MONTH_$(WK_COCOA_TOUCH));
>-ENABLE_INPUT_TYPE_MONTH_cocoatouch = ENABLE_INPUT_TYPE_MONTH;
>-
>-ENABLE_INPUT_TYPE_TIME = $(ENABLE_INPUT_TYPE_TIME_$(WK_COCOA_TOUCH));
>-ENABLE_INPUT_TYPE_TIME_cocoatouch = ENABLE_INPUT_TYPE_TIME;
>-
>-ENABLE_INPUT_TYPE_WEEK = $(ENABLE_INPUT_TYPE_WEEK_$(WK_COCOA_TOUCH));
>-ENABLE_INPUT_TYPE_WEEK_cocoatouch = ENABLE_INPUT_TYPE_WEEK;
>+ENABLE_INPUT_TYPE_DATE = $(ENABLE_INPUT_TYPE_DATE_$(WK_PLATFORM_NAME));
>+ENABLE_INPUT_TYPE_DATE_iphoneos = ENABLE_INPUT_TYPE_DATE;
>+ENABLE_INPUT_TYPE_DATE_iphonesimulator = ENABLE_INPUT_TYPE_DATE;
>+ENABLE_INPUT_TYPE_DATE_watchos = ENABLE_INPUT_TYPE_DATE;
>+ENABLE_INPUT_TYPE_DATE_watchsimulator = ENABLE_INPUT_TYPE_DATE;
>+
>+ENABLE_INPUT_TYPE_MONTH = $(ENABLE_INPUT_TYPE_MONTH_$(WK_PLATFORM_NAME));
>+ENABLE_INPUT_TYPE_MONTH_iphoneos = ENABLE_INPUT_TYPE_MONTH;
>+ENABLE_INPUT_TYPE_MONTH_iphonesimulator = ENABLE_INPUT_TYPE_MONTH;
>+ENABLE_INPUT_TYPE_MONTH_watchos = ENABLE_INPUT_TYPE_MONTH;
>+ENABLE_INPUT_TYPE_MONTH_watchsimulator = ENABLE_INPUT_TYPE_MONTH;
>+
>+ENABLE_INPUT_TYPE_TIME = $(ENABLE_INPUT_TYPE_TIME_$(WK_PLATFORM_NAME));
>+ENABLE_INPUT_TYPE_TIME_iphoneos = ENABLE_INPUT_TYPE_TIME;
>+ENABLE_INPUT_TYPE_TIME_iphonesimulator = ENABLE_INPUT_TYPE_TIME;
>+ENABLE_INPUT_TYPE_TIME_watchos = ENABLE_INPUT_TYPE_TIME;
>+ENABLE_INPUT_TYPE_TIME_watchsimulator = ENABLE_INPUT_TYPE_TIME;
>+
>+ENABLE_INPUT_TYPE_WEEK = $(ENABLE_INPUT_TYPE_WEEK_$(WK_PLATFORM_NAME));
>+ENABLE_INPUT_TYPE_WEEK_iphoneos = ENABLE_INPUT_TYPE_WEEK;
>+ENABLE_INPUT_TYPE_WEEK_iphonesimulator = ENABLE_INPUT_TYPE_WEEK;
>+ENABLE_INPUT_TYPE_WEEK_watchos = ENABLE_INPUT_TYPE_WEEK;
>+ENABLE_INPUT_TYPE_WEEK_watchsimulator = ENABLE_INPUT_TYPE_WEEK;
> 
> ENABLE_INSPECTOR_ALTERNATE_DISPATCHERS = ENABLE_INSPECTOR_ALTERNATE_DISPATCHERS;
>

Actions: View | Formatted Diff | Diff

Attachments on bug 197287: 368247 | 368263