[watchOS] Disable Content Filtering in the simulator build
authoraestes@apple.com <aestes@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 22 Aug 2019 23:54:59 +0000 (23:54 +0000)
committeraestes@apple.com <aestes@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 22 Aug 2019 23:54:59 +0000 (23:54 +0000)
https://bugs.webkit.org/show_bug.cgi?id=201047

Reviewed by Tim Horton.

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/Platform.h:

Tools:

* TestWebKitAPI/Configurations/FeatureDefines.xcconfig:

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

14 files changed:
Source/JavaScriptCore/ChangeLog
Source/JavaScriptCore/Configurations/FeatureDefines.xcconfig
Source/WTF/ChangeLog
Source/WTF/wtf/Platform.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 1c6664f..ee85f8e 100644 (file)
@@ -1,3 +1,12 @@
+2019-08-22  Andy Estes  <aestes@apple.com>
+
+        [watchOS] Disable Content Filtering in the simulator build
+        https://bugs.webkit.org/show_bug.cgi?id=201047
+
+        Reviewed by Tim Horton.
+
+        * Configurations/FeatureDefines.xcconfig:
+
 2019-08-22  Adrian Perez de Castro  <aperez@igalia.com>
 
         [GTK][WPE] Fixes for non-unified builds after r248547
index 165b41b..accf9a9 100644 (file)
@@ -74,7 +74,9 @@ 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;
-ENABLE_CONTENT_FILTERING_watchsimulator = ENABLE_CONTENT_FILTERING;
+
+// FIXME: Enable for watchsimulator once rdar://problem/54608386 is resolved
+ENABLE_CONTENT_FILTERING_watchsimulator = ;
 
 ENABLE_CSS3_TEXT = ;
 
index 4d2b9d0..fe7957c 100644 (file)
@@ -1,3 +1,12 @@
+2019-08-22  Andy Estes  <aestes@apple.com>
+
+        [watchOS] Disable Content Filtering in the simulator build
+        https://bugs.webkit.org/show_bug.cgi?id=201047
+
+        Reviewed by Tim Horton.
+
+        * wtf/Platform.h:
+
 2019-08-22  Keith Rollin  <krollin@apple.com>
 
         Remove support for tvOS < 13.0
index 419264f..ea876ee 100644 (file)
 #define ENABLE_DATA_DETECTION 1
 #endif
 
-#if !PLATFORM(APPLETV)
+/* FIXME: Enable HAVE_PARENTAL_CONTROLS for watchOS Simulator once rdar://problem/54608386 is resolved */
+#if !PLATFORM(APPLETV) && (!PLATFORM(WATCHOS) || !PLATFORM(IOS_FAMILY_SIMULATOR))
 #define HAVE_PARENTAL_CONTROLS 1
 #endif
 
index 3d4625b..e8ce78a 100644 (file)
@@ -1,3 +1,12 @@
+2019-08-22  Andy Estes  <aestes@apple.com>
+
+        [watchOS] Disable Content Filtering in the simulator build
+        https://bugs.webkit.org/show_bug.cgi?id=201047
+
+        Reviewed by Tim Horton.
+
+        * Configurations/FeatureDefines.xcconfig:
+
 2019-08-22  Chris Dumez  <cdumez@apple.com>
 
         Try to recover nicely when getting an unexpected schema in the service workers database
index 165b41b..accf9a9 100644 (file)
@@ -74,7 +74,9 @@ 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;
-ENABLE_CONTENT_FILTERING_watchsimulator = ENABLE_CONTENT_FILTERING;
+
+// FIXME: Enable for watchsimulator once rdar://problem/54608386 is resolved
+ENABLE_CONTENT_FILTERING_watchsimulator = ;
 
 ENABLE_CSS3_TEXT = ;
 
index 1865135..fb0915a 100644 (file)
@@ -1,3 +1,12 @@
+2019-08-22  Andy Estes  <aestes@apple.com>
+
+        [watchOS] Disable Content Filtering in the simulator build
+        https://bugs.webkit.org/show_bug.cgi?id=201047
+
+        Reviewed by Tim Horton.
+
+        * Configurations/FeatureDefines.xcconfig:
+
 2019-08-22  Keith Rollin  <krollin@apple.com>
 
         Remove support for tvOS < 13.0
index 165b41b..accf9a9 100644 (file)
@@ -74,7 +74,9 @@ 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;
-ENABLE_CONTENT_FILTERING_watchsimulator = ENABLE_CONTENT_FILTERING;
+
+// FIXME: Enable for watchsimulator once rdar://problem/54608386 is resolved
+ENABLE_CONTENT_FILTERING_watchsimulator = ;
 
 ENABLE_CSS3_TEXT = ;
 
index c8ebd6b..ede351d 100644 (file)
@@ -1,3 +1,12 @@
+2019-08-22  Andy Estes  <aestes@apple.com>
+
+        [watchOS] Disable Content Filtering in the simulator build
+        https://bugs.webkit.org/show_bug.cgi?id=201047
+
+        Reviewed by Tim Horton.
+
+        * Configurations/FeatureDefines.xcconfig:
+
 2019-08-22  Daniel Bates  <dabates@apple.com>
 
         [iOS] Should show input view when became first responder if keyboard was showing when the view was resigned
index 165b41b..accf9a9 100644 (file)
@@ -74,7 +74,9 @@ 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;
-ENABLE_CONTENT_FILTERING_watchsimulator = ENABLE_CONTENT_FILTERING;
+
+// FIXME: Enable for watchsimulator once rdar://problem/54608386 is resolved
+ENABLE_CONTENT_FILTERING_watchsimulator = ;
 
 ENABLE_CSS3_TEXT = ;
 
index 315c1ea..72def77 100644 (file)
@@ -1,3 +1,12 @@
+2019-08-22  Andy Estes  <aestes@apple.com>
+
+        [watchOS] Disable Content Filtering in the simulator build
+        https://bugs.webkit.org/show_bug.cgi?id=201047
+
+        Reviewed by Tim Horton.
+
+        * Configurations/FeatureDefines.xcconfig:
+
 2019-08-21  Tim Horton  <timothy_horton@apple.com>
 
         [Mail] Tapping top of message scrolls back to copied text instead of top of the message
index 165b41b..accf9a9 100644 (file)
@@ -74,7 +74,9 @@ 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;
-ENABLE_CONTENT_FILTERING_watchsimulator = ENABLE_CONTENT_FILTERING;
+
+// FIXME: Enable for watchsimulator once rdar://problem/54608386 is resolved
+ENABLE_CONTENT_FILTERING_watchsimulator = ;
 
 ENABLE_CSS3_TEXT = ;
 
index 1a7714f..7baf573 100644 (file)
@@ -1,3 +1,12 @@
+2019-08-22  Andy Estes  <aestes@apple.com>
+
+        [watchOS] Disable Content Filtering in the simulator build
+        https://bugs.webkit.org/show_bug.cgi?id=201047
+
+        Reviewed by Tim Horton.
+
+        * TestWebKitAPI/Configurations/FeatureDefines.xcconfig:
+
 2019-08-22  Chris Dumez  <cdumez@apple.com>
 
         Try to recover nicely when getting an unexpected schema in the service workers database
index 165b41b..accf9a9 100644 (file)
@@ -74,7 +74,9 @@ 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;
-ENABLE_CONTENT_FILTERING_watchsimulator = ENABLE_CONTENT_FILTERING;
+
+// FIXME: Enable for watchsimulator once rdar://problem/54608386 is resolved
+ENABLE_CONTENT_FILTERING_watchsimulator = ;
 
 ENABLE_CSS3_TEXT = ;