[webkit-changes] [262541] trunk

Thu, 04 Jun 2020 09:03:14 -0700

Title: [262541] trunk
Revision
262541
Author
[email protected]
Date
2020-06-04 09:02:13 -0700 (Thu, 04 Jun 2020)

Log Message

[watchOS] Re-enable content filtering in the simulator build
https://bugs.webkit.org/show_bug.cgi?id=212711
<rdar://problem/63938350>

Reviewed by Wenson Hsieh.

Source/_javascript_Core:

* Configurations/FeatureDefines.xcconfig:

Source/WebCore:

* Configurations/FeatureDefines.xcconfig:

Source/WebCore/PAL:

* Configurations/FeatureDefines.xcconfig:

Source/WebKit:

* Configurations/FeatureDefines.xcconfig:

Source/WebKitLegacy/mac:

* Configurations/FeatureDefines.xcconfig:

Source/WTF:

* wtf/PlatformHave.h:

Tools:

* TestWebKitAPI/Configurations/FeatureDefines.xcconfig:

Modified Paths

Diff

Modified: trunk/Source/_javascript_Core/ChangeLog (262540 => 262541)


--- trunk/Source/_javascript_Core/ChangeLog	2020-06-04 15:49:50 UTC (rev 262540)
+++ trunk/Source/_javascript_Core/ChangeLog	2020-06-04 16:02:13 UTC (rev 262541)
@@ -1,3 +1,13 @@
+2020-06-04  Andy Estes  <[email protected]>
+
+        [watchOS] Re-enable content filtering in the simulator build
+        https://bugs.webkit.org/show_bug.cgi?id=212711
+        <rdar://problem/63938350>
+
+        Reviewed by Wenson Hsieh.
+
+        * Configurations/FeatureDefines.xcconfig:
+
 2020-06-04  Mark Lam  <[email protected]>
 
         SpeculativeJIT::compileDateGet()'s slow path does not need an exception check.

Modified: trunk/Source/_javascript_Core/Configurations/FeatureDefines.xcconfig (262540 => 262541)


--- trunk/Source/_javascript_Core/Configurations/FeatureDefines.xcconfig	2020-06-04 15:49:50 UTC (rev 262540)
+++ trunk/Source/_javascript_Core/Configurations/FeatureDefines.xcconfig	2020-06-04 16:02:13 UTC (rev 262541)
@@ -75,10 +75,9 @@
 ENABLE_CONTENT_FILTERING_maccatalyst = ENABLE_CONTENT_FILTERING;
 ENABLE_CONTENT_FILTERING_macosx = ENABLE_CONTENT_FILTERING;
 ENABLE_CONTENT_FILTERING_watchos = ENABLE_CONTENT_FILTERING;
+ENABLE_CONTENT_FILTERING_watchsimulator = ENABLE_CONTENT_FILTERING;
+ENABLE_CONTENT_FILTERING_watchsimulator[sdk=watch*6.*] = ;
 
-// FIXME: Enable for watchsimulator once rdar://problem/54608386 is resolved
-ENABLE_CONTENT_FILTERING_watchsimulator = ;
-
 ENABLE_CSS3_TEXT = ;
 
 ENABLE_CSS_BOX_DECORATION_BREAK = ENABLE_CSS_BOX_DECORATION_BREAK;

Modified: trunk/Source/WTF/ChangeLog (262540 => 262541)


--- trunk/Source/WTF/ChangeLog	2020-06-04 15:49:50 UTC (rev 262540)
+++ trunk/Source/WTF/ChangeLog	2020-06-04 16:02:13 UTC (rev 262541)
@@ -1,3 +1,13 @@
+2020-06-04  Andy Estes  <[email protected]>
+
+        [watchOS] Re-enable content filtering in the simulator build
+        https://bugs.webkit.org/show_bug.cgi?id=212711
+        <rdar://problem/63938350>
+
+        Reviewed by Wenson Hsieh.
+
+        * wtf/PlatformHave.h:
+
 2020-06-03  Andy Estes  <[email protected]>
 
         [Apple Pay] Add new values for -apple-pay-button-type

Modified: trunk/Source/WTF/wtf/PlatformHave.h (262540 => 262541)


--- trunk/Source/WTF/wtf/PlatformHave.h	2020-06-04 15:49:50 UTC (rev 262540)
+++ trunk/Source/WTF/wtf/PlatformHave.h	2020-06-04 16:02:13 UTC (rev 262541)
@@ -260,8 +260,7 @@
 #define HAVE_PARENTAL_CONTROLS_WITH_UNBLOCK_HANDLER 1
 #endif
 
-/* FIXME: Enable HAVE_PARENTAL_CONTROLS for watchOS Simulator once rdar://problem/54608386 is resolved */
-#if PLATFORM(COCOA) && (!PLATFORM(APPLETV) && (!PLATFORM(WATCHOS) || !PLATFORM(IOS_FAMILY_SIMULATOR)))
+#if PLATFORM(COCOA) && (!PLATFORM(APPLETV) && (!PLATFORM(WATCHOS) || !PLATFORM(IOS_FAMILY_SIMULATOR) || __WATCH_OS_VERSION_MIN_REQUIRED >= 70000))
 #define HAVE_PARENTAL_CONTROLS 1
 #endif

Modified: trunk/Source/WebCore/ChangeLog (262540 => 262541)


--- trunk/Source/WebCore/ChangeLog	2020-06-04 15:49:50 UTC (rev 262540)
+++ trunk/Source/WebCore/ChangeLog	2020-06-04 16:02:13 UTC (rev 262541)
@@ -1,3 +1,13 @@
+2020-06-04  Andy Estes  <[email protected]>
+
+        [watchOS] Re-enable content filtering in the simulator build
+        https://bugs.webkit.org/show_bug.cgi?id=212711
+        <rdar://problem/63938350>
+
+        Reviewed by Wenson Hsieh.
+
+        * Configurations/FeatureDefines.xcconfig:
+
 2020-06-04  Zalan Bujtas  <[email protected]>
 
         Reset fragment line info when the relatively positioned inline box becomes static with block child.

Modified: trunk/Source/WebCore/Configurations/FeatureDefines.xcconfig (262540 => 262541)


--- trunk/Source/WebCore/Configurations/FeatureDefines.xcconfig	2020-06-04 15:49:50 UTC (rev 262540)
+++ trunk/Source/WebCore/Configurations/FeatureDefines.xcconfig	2020-06-04 16:02:13 UTC (rev 262541)
@@ -75,10 +75,9 @@
 ENABLE_CONTENT_FILTERING_maccatalyst = ENABLE_CONTENT_FILTERING;
 ENABLE_CONTENT_FILTERING_macosx = ENABLE_CONTENT_FILTERING;
 ENABLE_CONTENT_FILTERING_watchos = ENABLE_CONTENT_FILTERING;
+ENABLE_CONTENT_FILTERING_watchsimulator = ENABLE_CONTENT_FILTERING;
+ENABLE_CONTENT_FILTERING_watchsimulator[sdk=watch*6.*] = ;
 
-// FIXME: Enable for watchsimulator once rdar://problem/54608386 is resolved
-ENABLE_CONTENT_FILTERING_watchsimulator = ;
-
 ENABLE_CSS3_TEXT = ;
 
 ENABLE_CSS_BOX_DECORATION_BREAK = ENABLE_CSS_BOX_DECORATION_BREAK;

Modified: trunk/Source/WebCore/PAL/ChangeLog (262540 => 262541)


--- trunk/Source/WebCore/PAL/ChangeLog	2020-06-04 15:49:50 UTC (rev 262540)
+++ trunk/Source/WebCore/PAL/ChangeLog	2020-06-04 16:02:13 UTC (rev 262541)
@@ -1,3 +1,13 @@
+2020-06-04  Andy Estes  <[email protected]>
+
+        [watchOS] Re-enable content filtering in the simulator build
+        https://bugs.webkit.org/show_bug.cgi?id=212711
+        <rdar://problem/63938350>
+
+        Reviewed by Wenson Hsieh.
+
+        * Configurations/FeatureDefines.xcconfig:
+
 2020-06-02  Keith Rollin  <[email protected]>
 
         Revert FEATURES_DEFINES related changes

Modified: trunk/Source/WebCore/PAL/Configurations/FeatureDefines.xcconfig (262540 => 262541)


--- trunk/Source/WebCore/PAL/Configurations/FeatureDefines.xcconfig	2020-06-04 15:49:50 UTC (rev 262540)
+++ trunk/Source/WebCore/PAL/Configurations/FeatureDefines.xcconfig	2020-06-04 16:02:13 UTC (rev 262541)
@@ -75,10 +75,9 @@
 ENABLE_CONTENT_FILTERING_maccatalyst = ENABLE_CONTENT_FILTERING;
 ENABLE_CONTENT_FILTERING_macosx = ENABLE_CONTENT_FILTERING;
 ENABLE_CONTENT_FILTERING_watchos = ENABLE_CONTENT_FILTERING;
+ENABLE_CONTENT_FILTERING_watchsimulator = ENABLE_CONTENT_FILTERING;
+ENABLE_CONTENT_FILTERING_watchsimulator[sdk=watch*6.*] = ;
 
-// FIXME: Enable for watchsimulator once rdar://problem/54608386 is resolved
-ENABLE_CONTENT_FILTERING_watchsimulator = ;
-
 ENABLE_CSS3_TEXT = ;
 
 ENABLE_CSS_BOX_DECORATION_BREAK = ENABLE_CSS_BOX_DECORATION_BREAK;

Modified: trunk/Source/WebKit/ChangeLog (262540 => 262541)


--- trunk/Source/WebKit/ChangeLog	2020-06-04 15:49:50 UTC (rev 262540)
+++ trunk/Source/WebKit/ChangeLog	2020-06-04 16:02:13 UTC (rev 262541)
@@ -1,3 +1,13 @@
+2020-06-04  Andy Estes  <[email protected]>
+
+        [watchOS] Re-enable content filtering in the simulator build
+        https://bugs.webkit.org/show_bug.cgi?id=212711
+        <rdar://problem/63938350>
+
+        Reviewed by Wenson Hsieh.
+
+        * Configurations/FeatureDefines.xcconfig:
+
 2020-06-04  Kate Cheney  <[email protected]>
 
         ITP SQLite Database should only vacuum once per day

Modified: trunk/Source/WebKit/Configurations/FeatureDefines.xcconfig (262540 => 262541)


--- trunk/Source/WebKit/Configurations/FeatureDefines.xcconfig	2020-06-04 15:49:50 UTC (rev 262540)
+++ trunk/Source/WebKit/Configurations/FeatureDefines.xcconfig	2020-06-04 16:02:13 UTC (rev 262541)
@@ -75,10 +75,9 @@
 ENABLE_CONTENT_FILTERING_maccatalyst = ENABLE_CONTENT_FILTERING;
 ENABLE_CONTENT_FILTERING_macosx = ENABLE_CONTENT_FILTERING;
 ENABLE_CONTENT_FILTERING_watchos = ENABLE_CONTENT_FILTERING;
+ENABLE_CONTENT_FILTERING_watchsimulator = ENABLE_CONTENT_FILTERING;
+ENABLE_CONTENT_FILTERING_watchsimulator[sdk=watch*6.*] = ;
 
-// FIXME: Enable for watchsimulator once rdar://problem/54608386 is resolved
-ENABLE_CONTENT_FILTERING_watchsimulator = ;
-
 ENABLE_CSS3_TEXT = ;
 
 ENABLE_CSS_BOX_DECORATION_BREAK = ENABLE_CSS_BOX_DECORATION_BREAK;

Modified: trunk/Source/WebKitLegacy/mac/ChangeLog (262540 => 262541)


--- trunk/Source/WebKitLegacy/mac/ChangeLog	2020-06-04 15:49:50 UTC (rev 262540)
+++ trunk/Source/WebKitLegacy/mac/ChangeLog	2020-06-04 16:02:13 UTC (rev 262541)
@@ -1,3 +1,13 @@
+2020-06-04  Andy Estes  <[email protected]>
+
+        [watchOS] Re-enable content filtering in the simulator build
+        https://bugs.webkit.org/show_bug.cgi?id=212711
+        <rdar://problem/63938350>
+
+        Reviewed by Wenson Hsieh.
+
+        * Configurations/FeatureDefines.xcconfig:
+
 2020-06-02  Keith Rollin  <[email protected]>
 
         Revert FEATURES_DEFINES related changes

Modified: trunk/Source/WebKitLegacy/mac/Configurations/FeatureDefines.xcconfig (262540 => 262541)


--- trunk/Source/WebKitLegacy/mac/Configurations/FeatureDefines.xcconfig	2020-06-04 15:49:50 UTC (rev 262540)
+++ trunk/Source/WebKitLegacy/mac/Configurations/FeatureDefines.xcconfig	2020-06-04 16:02:13 UTC (rev 262541)
@@ -75,10 +75,9 @@
 ENABLE_CONTENT_FILTERING_maccatalyst = ENABLE_CONTENT_FILTERING;
 ENABLE_CONTENT_FILTERING_macosx = ENABLE_CONTENT_FILTERING;
 ENABLE_CONTENT_FILTERING_watchos = ENABLE_CONTENT_FILTERING;
+ENABLE_CONTENT_FILTERING_watchsimulator = ENABLE_CONTENT_FILTERING;
+ENABLE_CONTENT_FILTERING_watchsimulator[sdk=watch*6.*] = ;
 
-// FIXME: Enable for watchsimulator once rdar://problem/54608386 is resolved
-ENABLE_CONTENT_FILTERING_watchsimulator = ;
-
 ENABLE_CSS3_TEXT = ;
 
 ENABLE_CSS_BOX_DECORATION_BREAK = ENABLE_CSS_BOX_DECORATION_BREAK;

Modified: trunk/Tools/ChangeLog (262540 => 262541)


--- trunk/Tools/ChangeLog	2020-06-04 15:49:50 UTC (rev 262540)
+++ trunk/Tools/ChangeLog	2020-06-04 16:02:13 UTC (rev 262541)
@@ -1,3 +1,13 @@
+2020-06-04  Andy Estes  <[email protected]>
+
+        [watchOS] Re-enable content filtering in the simulator build
+        https://bugs.webkit.org/show_bug.cgi?id=212711
+        <rdar://problem/63938350>
+
+        Reviewed by Wenson Hsieh.
+
+        * TestWebKitAPI/Configurations/FeatureDefines.xcconfig:
+
 2020-06-04  Philippe Normand  <[email protected]>
 
         [Flatpak SDK] Update definitions

Modified: trunk/Tools/TestWebKitAPI/Configurations/FeatureDefines.xcconfig (262540 => 262541)


--- trunk/Tools/TestWebKitAPI/Configurations/FeatureDefines.xcconfig	2020-06-04 15:49:50 UTC (rev 262540)
+++ trunk/Tools/TestWebKitAPI/Configurations/FeatureDefines.xcconfig	2020-06-04 16:02:13 UTC (rev 262541)
@@ -75,10 +75,9 @@
 ENABLE_CONTENT_FILTERING_maccatalyst = ENABLE_CONTENT_FILTERING;
 ENABLE_CONTENT_FILTERING_macosx = ENABLE_CONTENT_FILTERING;
 ENABLE_CONTENT_FILTERING_watchos = ENABLE_CONTENT_FILTERING;
+ENABLE_CONTENT_FILTERING_watchsimulator = ENABLE_CONTENT_FILTERING;
+ENABLE_CONTENT_FILTERING_watchsimulator[sdk=watch*6.*] = ;
 
-// FIXME: Enable for watchsimulator once rdar://problem/54608386 is resolved
-ENABLE_CONTENT_FILTERING_watchsimulator = ;
-
 ENABLE_CSS3_TEXT = ;
 
 ENABLE_CSS_BOX_DECORATION_BREAK = ENABLE_CSS_BOX_DECORATION_BREAK;

_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to