[watchOS] Re-enable content filtering in the simulator build
authoraestes@apple.com <aestes@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 4 Jun 2020 16:02:13 +0000 (16:02 +0000)
committeraestes@apple.com <aestes@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 4 Jun 2020 16:02:13 +0000 (16:02 +0000)
https://bugs.webkit.org/show_bug.cgi?id=212711
<rdar://problem/63938350>

Reviewed by Wenson Hsieh.

Source/JavaScriptCore:

* 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:

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@262541 268f45cc-cd09-0410-ab3c-d52691b4dbfc

14 files changed:
Source/JavaScriptCore/ChangeLog
Source/JavaScriptCore/Configurations/FeatureDefines.xcconfig
Source/WTF/ChangeLog
Source/WTF/wtf/PlatformHave.h
Source/WebCore/ChangeLog
Source/WebCore/Configurations/FeatureDefines.xcconfig
Source/WebCore/PAL/ChangeLog
Source/WebCore/PAL/Configurations/FeatureDefines.xcconfig
Source/WebKit/ChangeLog
Source/WebKit/Configurations/FeatureDefines.xcconfig
Source/WebKitLegacy/mac/ChangeLog
Source/WebKitLegacy/mac/Configurations/FeatureDefines.xcconfig
Tools/ChangeLog
Tools/TestWebKitAPI/Configurations/FeatureDefines.xcconfig

index 627bc4f..2878506 100644 (file)
@@ -1,3 +1,13 @@
+2020-06-04  Andy Estes  <aestes@apple.com>
+
+        [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  <mark.lam@apple.com>
 
         SpeculativeJIT::compileDateGet()'s slow path does not need an exception check.
index 3e6978e..79e0f9a 100644 (file)
@@ -75,9 +75,8 @@ ENABLE_CONTENT_FILTERING_iphonesimulator = ENABLE_CONTENT_FILTERING;
 ENABLE_CONTENT_FILTERING_maccatalyst = ENABLE_CONTENT_FILTERING;
 ENABLE_CONTENT_FILTERING_macosx = ENABLE_CONTENT_FILTERING;
 ENABLE_CONTENT_FILTERING_watchos = ENABLE_CONTENT_FILTERING;
-
-// FIXME: Enable for watchsimulator once rdar://problem/54608386 is resolved
-ENABLE_CONTENT_FILTERING_watchsimulator = ;
+ENABLE_CONTENT_FILTERING_watchsimulator = ENABLE_CONTENT_FILTERING;
+ENABLE_CONTENT_FILTERING_watchsimulator[sdk=watch*6.*] = ;
 
 ENABLE_CSS3_TEXT = ;
 
index 9203033..cc011cf 100644 (file)
@@ -1,3 +1,13 @@
+2020-06-04  Andy Estes  <aestes@apple.com>
+
+        [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  <aestes@apple.com>
 
         [Apple Pay] Add new values for -apple-pay-button-type
index 558fb04..7ecaa25 100644 (file)
 #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
 
index 9d6cc4c..206dbdd 100644 (file)
@@ -1,3 +1,13 @@
+2020-06-04  Andy Estes  <aestes@apple.com>
+
+        [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  <zalan@apple.com>
 
         Reset fragment line info when the relatively positioned inline box becomes static with block child.
index 3e6978e..79e0f9a 100644 (file)
@@ -75,9 +75,8 @@ ENABLE_CONTENT_FILTERING_iphonesimulator = ENABLE_CONTENT_FILTERING;
 ENABLE_CONTENT_FILTERING_maccatalyst = ENABLE_CONTENT_FILTERING;
 ENABLE_CONTENT_FILTERING_macosx = ENABLE_CONTENT_FILTERING;
 ENABLE_CONTENT_FILTERING_watchos = ENABLE_CONTENT_FILTERING;
-
-// FIXME: Enable for watchsimulator once rdar://problem/54608386 is resolved
-ENABLE_CONTENT_FILTERING_watchsimulator = ;
+ENABLE_CONTENT_FILTERING_watchsimulator = ENABLE_CONTENT_FILTERING;
+ENABLE_CONTENT_FILTERING_watchsimulator[sdk=watch*6.*] = ;
 
 ENABLE_CSS3_TEXT = ;
 
index 66886af..ab7402f 100644 (file)
@@ -1,3 +1,13 @@
+2020-06-04  Andy Estes  <aestes@apple.com>
+
+        [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  <krollin@apple.com>
 
         Revert FEATURES_DEFINES related changes
index 3e6978e..79e0f9a 100644 (file)
@@ -75,9 +75,8 @@ ENABLE_CONTENT_FILTERING_iphonesimulator = ENABLE_CONTENT_FILTERING;
 ENABLE_CONTENT_FILTERING_maccatalyst = ENABLE_CONTENT_FILTERING;
 ENABLE_CONTENT_FILTERING_macosx = ENABLE_CONTENT_FILTERING;
 ENABLE_CONTENT_FILTERING_watchos = ENABLE_CONTENT_FILTERING;
-
-// FIXME: Enable for watchsimulator once rdar://problem/54608386 is resolved
-ENABLE_CONTENT_FILTERING_watchsimulator = ;
+ENABLE_CONTENT_FILTERING_watchsimulator = ENABLE_CONTENT_FILTERING;
+ENABLE_CONTENT_FILTERING_watchsimulator[sdk=watch*6.*] = ;
 
 ENABLE_CSS3_TEXT = ;
 
index a7caa22..8dff535 100644 (file)
@@ -1,3 +1,13 @@
+2020-06-04  Andy Estes  <aestes@apple.com>
+
+        [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  <katherine_cheney@apple.com>
 
         ITP SQLite Database should only vacuum once per day
index 3e6978e..79e0f9a 100644 (file)
@@ -75,9 +75,8 @@ ENABLE_CONTENT_FILTERING_iphonesimulator = ENABLE_CONTENT_FILTERING;
 ENABLE_CONTENT_FILTERING_maccatalyst = ENABLE_CONTENT_FILTERING;
 ENABLE_CONTENT_FILTERING_macosx = ENABLE_CONTENT_FILTERING;
 ENABLE_CONTENT_FILTERING_watchos = ENABLE_CONTENT_FILTERING;
-
-// FIXME: Enable for watchsimulator once rdar://problem/54608386 is resolved
-ENABLE_CONTENT_FILTERING_watchsimulator = ;
+ENABLE_CONTENT_FILTERING_watchsimulator = ENABLE_CONTENT_FILTERING;
+ENABLE_CONTENT_FILTERING_watchsimulator[sdk=watch*6.*] = ;
 
 ENABLE_CSS3_TEXT = ;
 
index 41db647..86592d7 100644 (file)
@@ -1,3 +1,13 @@
+2020-06-04  Andy Estes  <aestes@apple.com>
+
+        [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  <krollin@apple.com>
 
         Revert FEATURES_DEFINES related changes
index 3e6978e..79e0f9a 100644 (file)
@@ -75,9 +75,8 @@ ENABLE_CONTENT_FILTERING_iphonesimulator = ENABLE_CONTENT_FILTERING;
 ENABLE_CONTENT_FILTERING_maccatalyst = ENABLE_CONTENT_FILTERING;
 ENABLE_CONTENT_FILTERING_macosx = ENABLE_CONTENT_FILTERING;
 ENABLE_CONTENT_FILTERING_watchos = ENABLE_CONTENT_FILTERING;
-
-// FIXME: Enable for watchsimulator once rdar://problem/54608386 is resolved
-ENABLE_CONTENT_FILTERING_watchsimulator = ;
+ENABLE_CONTENT_FILTERING_watchsimulator = ENABLE_CONTENT_FILTERING;
+ENABLE_CONTENT_FILTERING_watchsimulator[sdk=watch*6.*] = ;
 
 ENABLE_CSS3_TEXT = ;
 
index a3c6fb0..6a3e3bc 100644 (file)
@@ -1,3 +1,13 @@
+2020-06-04  Andy Estes  <aestes@apple.com>
+
+        [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  <pnormand@igalia.com>
 
         [Flatpak SDK] Update definitions
index 3e6978e..79e0f9a 100644 (file)
@@ -75,9 +75,8 @@ ENABLE_CONTENT_FILTERING_iphonesimulator = ENABLE_CONTENT_FILTERING;
 ENABLE_CONTENT_FILTERING_maccatalyst = ENABLE_CONTENT_FILTERING;
 ENABLE_CONTENT_FILTERING_macosx = ENABLE_CONTENT_FILTERING;
 ENABLE_CONTENT_FILTERING_watchos = ENABLE_CONTENT_FILTERING;
-
-// FIXME: Enable for watchsimulator once rdar://problem/54608386 is resolved
-ENABLE_CONTENT_FILTERING_watchsimulator = ;
+ENABLE_CONTENT_FILTERING_watchsimulator = ENABLE_CONTENT_FILTERING;
+ENABLE_CONTENT_FILTERING_watchsimulator[sdk=watch*6.*] = ;
 
 ENABLE_CSS3_TEXT = ;