[webkit-changes] [249036] trunk

Thu, 22 Aug 2019 16:55:40 -0700

Title: [249036] trunk
Revision
249036
Author
[email protected]
Date
2019-08-22 16:54:59 -0700 (Thu, 22 Aug 2019)

Log Message

[watchOS] Disable Content Filtering in the simulator build
https://bugs.webkit.org/show_bug.cgi?id=201047

Reviewed by Tim Horton.

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

Tools:

* TestWebKitAPI/Configurations/FeatureDefines.xcconfig:

Modified Paths

Diff

Modified: trunk/Source/_javascript_Core/ChangeLog (249035 => 249036)


--- trunk/Source/_javascript_Core/ChangeLog	2019-08-22 23:28:45 UTC (rev 249035)
+++ trunk/Source/_javascript_Core/ChangeLog	2019-08-22 23:54:59 UTC (rev 249036)
@@ -1,3 +1,12 @@
+2019-08-22  Andy Estes  <[email protected]>
+
+        [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  <[email protected]>
 
         [GTK][WPE] Fixes for non-unified builds after r248547

Modified: trunk/Source/_javascript_Core/Configurations/FeatureDefines.xcconfig (249035 => 249036)


--- trunk/Source/_javascript_Core/Configurations/FeatureDefines.xcconfig	2019-08-22 23:28:45 UTC (rev 249035)
+++ trunk/Source/_javascript_Core/Configurations/FeatureDefines.xcconfig	2019-08-22 23:54:59 UTC (rev 249036)
@@ -74,8 +74,10 @@
 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 = ;
 
 ENABLE_CSS_BOX_DECORATION_BREAK = ENABLE_CSS_BOX_DECORATION_BREAK;

Modified: trunk/Source/WTF/ChangeLog (249035 => 249036)


--- trunk/Source/WTF/ChangeLog	2019-08-22 23:28:45 UTC (rev 249035)
+++ trunk/Source/WTF/ChangeLog	2019-08-22 23:54:59 UTC (rev 249036)
@@ -1,3 +1,12 @@
+2019-08-22  Andy Estes  <[email protected]>
+
+        [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  <[email protected]>
 
         Remove support for tvOS < 13.0

Modified: trunk/Source/WTF/wtf/Platform.h (249035 => 249036)


--- trunk/Source/WTF/wtf/Platform.h	2019-08-22 23:28:45 UTC (rev 249035)
+++ trunk/Source/WTF/wtf/Platform.h	2019-08-22 23:54:59 UTC (rev 249036)
@@ -1089,7 +1089,8 @@
 #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

Modified: trunk/Source/WebCore/ChangeLog (249035 => 249036)


--- trunk/Source/WebCore/ChangeLog	2019-08-22 23:28:45 UTC (rev 249035)
+++ trunk/Source/WebCore/ChangeLog	2019-08-22 23:54:59 UTC (rev 249036)
@@ -1,3 +1,12 @@
+2019-08-22  Andy Estes  <[email protected]>
+
+        [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  <[email protected]>
 
         Try to recover nicely when getting an unexpected schema in the service workers database

Modified: trunk/Source/WebCore/Configurations/FeatureDefines.xcconfig (249035 => 249036)


--- trunk/Source/WebCore/Configurations/FeatureDefines.xcconfig	2019-08-22 23:28:45 UTC (rev 249035)
+++ trunk/Source/WebCore/Configurations/FeatureDefines.xcconfig	2019-08-22 23:54:59 UTC (rev 249036)
@@ -74,8 +74,10 @@
 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 = ;
 
 ENABLE_CSS_BOX_DECORATION_BREAK = ENABLE_CSS_BOX_DECORATION_BREAK;

Modified: trunk/Source/WebCore/PAL/ChangeLog (249035 => 249036)


--- trunk/Source/WebCore/PAL/ChangeLog	2019-08-22 23:28:45 UTC (rev 249035)
+++ trunk/Source/WebCore/PAL/ChangeLog	2019-08-22 23:54:59 UTC (rev 249036)
@@ -1,3 +1,12 @@
+2019-08-22  Andy Estes  <[email protected]>
+
+        [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  <[email protected]>
 
         Remove support for tvOS < 13.0

Modified: trunk/Source/WebCore/PAL/Configurations/FeatureDefines.xcconfig (249035 => 249036)


--- trunk/Source/WebCore/PAL/Configurations/FeatureDefines.xcconfig	2019-08-22 23:28:45 UTC (rev 249035)
+++ trunk/Source/WebCore/PAL/Configurations/FeatureDefines.xcconfig	2019-08-22 23:54:59 UTC (rev 249036)
@@ -74,8 +74,10 @@
 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 = ;
 
 ENABLE_CSS_BOX_DECORATION_BREAK = ENABLE_CSS_BOX_DECORATION_BREAK;

Modified: trunk/Source/WebKit/ChangeLog (249035 => 249036)


--- trunk/Source/WebKit/ChangeLog	2019-08-22 23:28:45 UTC (rev 249035)
+++ trunk/Source/WebKit/ChangeLog	2019-08-22 23:54:59 UTC (rev 249036)
@@ -1,3 +1,12 @@
+2019-08-22  Andy Estes  <[email protected]>
+
+        [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  <[email protected]>
 
         [iOS] Should show input view when became first responder if keyboard was showing when the view was resigned

Modified: trunk/Source/WebKit/Configurations/FeatureDefines.xcconfig (249035 => 249036)


--- trunk/Source/WebKit/Configurations/FeatureDefines.xcconfig	2019-08-22 23:28:45 UTC (rev 249035)
+++ trunk/Source/WebKit/Configurations/FeatureDefines.xcconfig	2019-08-22 23:54:59 UTC (rev 249036)
@@ -74,8 +74,10 @@
 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 = ;
 
 ENABLE_CSS_BOX_DECORATION_BREAK = ENABLE_CSS_BOX_DECORATION_BREAK;

Modified: trunk/Source/WebKitLegacy/mac/ChangeLog (249035 => 249036)


--- trunk/Source/WebKitLegacy/mac/ChangeLog	2019-08-22 23:28:45 UTC (rev 249035)
+++ trunk/Source/WebKitLegacy/mac/ChangeLog	2019-08-22 23:54:59 UTC (rev 249036)
@@ -1,3 +1,12 @@
+2019-08-22  Andy Estes  <[email protected]>
+
+        [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  <[email protected]>
 
         [Mail] Tapping top of message scrolls back to copied text instead of top of the message

Modified: trunk/Source/WebKitLegacy/mac/Configurations/FeatureDefines.xcconfig (249035 => 249036)


--- trunk/Source/WebKitLegacy/mac/Configurations/FeatureDefines.xcconfig	2019-08-22 23:28:45 UTC (rev 249035)
+++ trunk/Source/WebKitLegacy/mac/Configurations/FeatureDefines.xcconfig	2019-08-22 23:54:59 UTC (rev 249036)
@@ -74,8 +74,10 @@
 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 = ;
 
 ENABLE_CSS_BOX_DECORATION_BREAK = ENABLE_CSS_BOX_DECORATION_BREAK;

Modified: trunk/Tools/ChangeLog (249035 => 249036)


--- trunk/Tools/ChangeLog	2019-08-22 23:28:45 UTC (rev 249035)
+++ trunk/Tools/ChangeLog	2019-08-22 23:54:59 UTC (rev 249036)
@@ -1,3 +1,12 @@
+2019-08-22  Andy Estes  <[email protected]>
+
+        [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  <[email protected]>
 
         Try to recover nicely when getting an unexpected schema in the service workers database

Modified: trunk/Tools/TestWebKitAPI/Configurations/FeatureDefines.xcconfig (249035 => 249036)


--- trunk/Tools/TestWebKitAPI/Configurations/FeatureDefines.xcconfig	2019-08-22 23:28:45 UTC (rev 249035)
+++ trunk/Tools/TestWebKitAPI/Configurations/FeatureDefines.xcconfig	2019-08-22 23:54:59 UTC (rev 249036)
@@ -74,8 +74,10 @@
 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 = ;
 
 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