[webkit-changes] [242200] branches/safari-607-branch

Thu, 28 Feb 2019 09:32:06 -0800

Title: [242200] branches/safari-607-branch
Revision
242200
Author
aes...@apple.com
Date
2019-02-28 09:31:11 -0800 (Thu, 28 Feb 2019)

Log Message

[watchOS] Disable Parental Controls content filtering
<rdar://problem/48464986>

Rubber-stamped by Beth Dakin.

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: branches/safari-607-branch/Source/_javascript_Core/ChangeLog (242199 => 242200)


--- branches/safari-607-branch/Source/_javascript_Core/ChangeLog	2019-02-28 13:17:41 UTC (rev 242199)
+++ branches/safari-607-branch/Source/_javascript_Core/ChangeLog	2019-02-28 17:31:11 UTC (rev 242200)
@@ -1,3 +1,12 @@
+2019-02-28  Andy Estes  <aes...@apple.com>
+
+        [watchOS] Disable Parental Controls content filtering
+        <rdar://problem/48464986>
+
+        Rubber-stamped by Beth Dakin.
+
+        * Configurations/FeatureDefines.xcconfig:
+
 2019-02-20  Alan Coon  <alanc...@apple.com>
 
         Cherry-pick r241772. rdar://problem/48248228

Modified: branches/safari-607-branch/Source/_javascript_Core/Configurations/FeatureDefines.xcconfig (242199 => 242200)


--- branches/safari-607-branch/Source/_javascript_Core/Configurations/FeatureDefines.xcconfig	2019-02-28 13:17:41 UTC (rev 242199)
+++ branches/safari-607-branch/Source/_javascript_Core/Configurations/FeatureDefines.xcconfig	2019-02-28 17:31:11 UTC (rev 242200)
@@ -73,8 +73,6 @@
 ENABLE_CONTENT_FILTERING_iphoneos = ENABLE_CONTENT_FILTERING;
 ENABLE_CONTENT_FILTERING_iphonesimulator = 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_CSS3_TEXT = ;

Modified: branches/safari-607-branch/Source/WTF/ChangeLog (242199 => 242200)


--- branches/safari-607-branch/Source/WTF/ChangeLog	2019-02-28 13:17:41 UTC (rev 242199)
+++ branches/safari-607-branch/Source/WTF/ChangeLog	2019-02-28 17:31:11 UTC (rev 242200)
@@ -1,3 +1,12 @@
+2019-02-28  Andy Estes  <aes...@apple.com>
+
+        [watchOS] Disable Parental Controls content filtering
+        <rdar://problem/48464986>
+
+        Rubber-stamped by Beth Dakin.
+
+        * wtf/Platform.h:
+
 2019-02-13  Alan Coon  <alanc...@apple.com>
 
         Cherry-pick r241288. rdar://problem/47992210

Modified: branches/safari-607-branch/Source/WTF/wtf/Platform.h (242199 => 242200)


--- branches/safari-607-branch/Source/WTF/wtf/Platform.h	2019-02-28 13:17:41 UTC (rev 242199)
+++ branches/safari-607-branch/Source/WTF/wtf/Platform.h	2019-02-28 17:31:11 UTC (rev 242200)
@@ -1082,7 +1082,7 @@
 #define ENABLE_DATA_DETECTION 1
 #endif
 
-#if !PLATFORM(APPLETV) && !PLATFORM(IOSMAC)
+#if !PLATFORM(APPLETV) && !PLATFORM(IOSMAC) && !PLATFORM(WATCHOS)
 #define HAVE_PARENTAL_CONTROLS 1
 #endif

Modified: branches/safari-607-branch/Source/WebCore/ChangeLog (242199 => 242200)


--- branches/safari-607-branch/Source/WebCore/ChangeLog	2019-02-28 13:17:41 UTC (rev 242199)
+++ branches/safari-607-branch/Source/WebCore/ChangeLog	2019-02-28 17:31:11 UTC (rev 242200)
@@ -1,3 +1,12 @@
+2019-02-28  Andy Estes  <aes...@apple.com>
+
+        [watchOS] Disable Parental Controls content filtering
+        <rdar://problem/48464986>
+
+        Rubber-stamped by Beth Dakin.
+
+        * Configurations/FeatureDefines.xcconfig:
+
 2019-02-27  Alan Coon  <alanc...@apple.com>
 
         Cherry-pick r242138. rdar://problem/48444136

Modified: branches/safari-607-branch/Source/WebCore/Configurations/FeatureDefines.xcconfig (242199 => 242200)


--- branches/safari-607-branch/Source/WebCore/Configurations/FeatureDefines.xcconfig	2019-02-28 13:17:41 UTC (rev 242199)
+++ branches/safari-607-branch/Source/WebCore/Configurations/FeatureDefines.xcconfig	2019-02-28 17:31:11 UTC (rev 242200)
@@ -73,8 +73,6 @@
 ENABLE_CONTENT_FILTERING_iphoneos = ENABLE_CONTENT_FILTERING;
 ENABLE_CONTENT_FILTERING_iphonesimulator = 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_CSS3_TEXT = ;

Modified: branches/safari-607-branch/Source/WebCore/PAL/ChangeLog (242199 => 242200)


--- branches/safari-607-branch/Source/WebCore/PAL/ChangeLog	2019-02-28 13:17:41 UTC (rev 242199)
+++ branches/safari-607-branch/Source/WebCore/PAL/ChangeLog	2019-02-28 17:31:11 UTC (rev 242200)
@@ -1,3 +1,12 @@
+2019-02-28  Andy Estes  <aes...@apple.com>
+
+        [watchOS] Disable Parental Controls content filtering
+        <rdar://problem/48464986>
+
+        Rubber-stamped by Beth Dakin.
+
+        * Configurations/FeatureDefines.xcconfig:
+
 2019-02-13  Alan Coon  <alanc...@apple.com>
 
         Cherry-pick r241288. rdar://problem/47992210

Modified: branches/safari-607-branch/Source/WebCore/PAL/Configurations/FeatureDefines.xcconfig (242199 => 242200)


--- branches/safari-607-branch/Source/WebCore/PAL/Configurations/FeatureDefines.xcconfig	2019-02-28 13:17:41 UTC (rev 242199)
+++ branches/safari-607-branch/Source/WebCore/PAL/Configurations/FeatureDefines.xcconfig	2019-02-28 17:31:11 UTC (rev 242200)
@@ -73,8 +73,6 @@
 ENABLE_CONTENT_FILTERING_iphoneos = ENABLE_CONTENT_FILTERING;
 ENABLE_CONTENT_FILTERING_iphonesimulator = 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_CSS3_TEXT = ;

Modified: branches/safari-607-branch/Source/WebKit/ChangeLog (242199 => 242200)


--- branches/safari-607-branch/Source/WebKit/ChangeLog	2019-02-28 13:17:41 UTC (rev 242199)
+++ branches/safari-607-branch/Source/WebKit/ChangeLog	2019-02-28 17:31:11 UTC (rev 242200)
@@ -1,3 +1,12 @@
+2019-02-28  Andy Estes  <aes...@apple.com>
+
+        [watchOS] Disable Parental Controls content filtering
+        <rdar://problem/48464986>
+
+        Rubber-stamped by Beth Dakin.
+
+        * Configurations/FeatureDefines.xcconfig:
+
 2019-02-27  Babak Shafiei  <bshaf...@apple.com>
 
         Apply patch. rdar://problem/48429676

Modified: branches/safari-607-branch/Source/WebKit/Configurations/FeatureDefines.xcconfig (242199 => 242200)


--- branches/safari-607-branch/Source/WebKit/Configurations/FeatureDefines.xcconfig	2019-02-28 13:17:41 UTC (rev 242199)
+++ branches/safari-607-branch/Source/WebKit/Configurations/FeatureDefines.xcconfig	2019-02-28 17:31:11 UTC (rev 242200)
@@ -73,8 +73,6 @@
 ENABLE_CONTENT_FILTERING_iphoneos = ENABLE_CONTENT_FILTERING;
 ENABLE_CONTENT_FILTERING_iphonesimulator = 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_CSS3_TEXT = ;

Modified: branches/safari-607-branch/Source/WebKitLegacy/mac/ChangeLog (242199 => 242200)


--- branches/safari-607-branch/Source/WebKitLegacy/mac/ChangeLog	2019-02-28 13:17:41 UTC (rev 242199)
+++ branches/safari-607-branch/Source/WebKitLegacy/mac/ChangeLog	2019-02-28 17:31:11 UTC (rev 242200)
@@ -1,3 +1,12 @@
+2019-02-28  Andy Estes  <aes...@apple.com>
+
+        [watchOS] Disable Parental Controls content filtering
+        <rdar://problem/48464986>
+
+        Rubber-stamped by Beth Dakin.
+
+        * Configurations/FeatureDefines.xcconfig:
+
 2019-02-07  Alan Coon  <alanc...@apple.com>
 
         Cherry-pick r241105. rdar://problem/47893571

Modified: branches/safari-607-branch/Source/WebKitLegacy/mac/Configurations/FeatureDefines.xcconfig (242199 => 242200)


--- branches/safari-607-branch/Source/WebKitLegacy/mac/Configurations/FeatureDefines.xcconfig	2019-02-28 13:17:41 UTC (rev 242199)
+++ branches/safari-607-branch/Source/WebKitLegacy/mac/Configurations/FeatureDefines.xcconfig	2019-02-28 17:31:11 UTC (rev 242200)
@@ -73,8 +73,6 @@
 ENABLE_CONTENT_FILTERING_iphoneos = ENABLE_CONTENT_FILTERING;
 ENABLE_CONTENT_FILTERING_iphonesimulator = 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_CSS3_TEXT = ;

Modified: branches/safari-607-branch/Tools/ChangeLog (242199 => 242200)


--- branches/safari-607-branch/Tools/ChangeLog	2019-02-28 13:17:41 UTC (rev 242199)
+++ branches/safari-607-branch/Tools/ChangeLog	2019-02-28 17:31:11 UTC (rev 242200)
@@ -1,3 +1,12 @@
+2019-02-28  Andy Estes  <aes...@apple.com>
+
+        [watchOS] Disable Parental Controls content filtering
+        <rdar://problem/48464986>
+
+        Rubber-stamped by Beth Dakin.
+
+        * TestWebKitAPI/Configurations/FeatureDefines.xcconfig:
+
 2019-02-27  Babak Shafiei  <bshaf...@apple.com>
 
         Apply patch. rdar://problem/48429676

Modified: branches/safari-607-branch/Tools/TestWebKitAPI/Configurations/FeatureDefines.xcconfig (242199 => 242200)


--- branches/safari-607-branch/Tools/TestWebKitAPI/Configurations/FeatureDefines.xcconfig	2019-02-28 13:17:41 UTC (rev 242199)
+++ branches/safari-607-branch/Tools/TestWebKitAPI/Configurations/FeatureDefines.xcconfig	2019-02-28 17:31:11 UTC (rev 242200)
@@ -73,8 +73,6 @@
 ENABLE_CONTENT_FILTERING_iphoneos = ENABLE_CONTENT_FILTERING;
 ENABLE_CONTENT_FILTERING_iphonesimulator = 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_CSS3_TEXT = ;
 

_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to