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

Thu, 31 Jan 2019 00:11:14 -0800

Title: [240771] branches/safari-607-branch
Revision
240771
Author
bshaf...@apple.com
Date
2019-01-31 00:10:36 -0800 (Thu, 31 Jan 2019)

Log Message

Cherry-pick r240633. rdar://problem/47682687

    [watchOS] Enable Parental Controls content filtering
    https://bugs.webkit.org/show_bug.cgi?id=193939
    <rdar://problem/46641912>

    Reviewed by Ryosuke Niwa.

    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:

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

Modified Paths

Diff

Modified: branches/safari-607-branch/Source/_javascript_Core/ChangeLog (240770 => 240771)


--- branches/safari-607-branch/Source/_javascript_Core/ChangeLog	2019-01-31 08:10:30 UTC (rev 240770)
+++ branches/safari-607-branch/Source/_javascript_Core/ChangeLog	2019-01-31 08:10:36 UTC (rev 240771)
@@ -1,5 +1,56 @@
 2019-01-30  Babak Shafiei  <bshaf...@apple.com>
 
+        Cherry-pick r240633. rdar://problem/47682687
+
+    [watchOS] Enable Parental Controls content filtering
+    https://bugs.webkit.org/show_bug.cgi?id=193939
+    <rdar://problem/46641912>
+    
+    Reviewed by Ryosuke Niwa.
+    
+    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:
+    
+    
+    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@240633 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+    2019-01-28  Andy Estes  <aes...@apple.com>
+
+            [watchOS] Enable Parental Controls content filtering
+            https://bugs.webkit.org/show_bug.cgi?id=193939
+            <rdar://problem/46641912>
+
+            Reviewed by Ryosuke Niwa.
+
+            * Configurations/FeatureDefines.xcconfig:
+
+2019-01-30  Babak Shafiei  <bshaf...@apple.com>
+
         Cherry-pick r239969. rdar://problem/47638452
 
     Add option to JSC to dump memory footprint on script completion

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


--- branches/safari-607-branch/Source/_javascript_Core/Configurations/FeatureDefines.xcconfig	2019-01-31 08:10:30 UTC (rev 240770)
+++ branches/safari-607-branch/Source/_javascript_Core/Configurations/FeatureDefines.xcconfig	2019-01-31 08:10:36 UTC (rev 240771)
@@ -73,6 +73,8 @@
 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 (240770 => 240771)


--- branches/safari-607-branch/Source/WTF/ChangeLog	2019-01-31 08:10:30 UTC (rev 240770)
+++ branches/safari-607-branch/Source/WTF/ChangeLog	2019-01-31 08:10:36 UTC (rev 240771)
@@ -1,3 +1,54 @@
+2019-01-30  Babak Shafiei  <bshaf...@apple.com>
+
+        Cherry-pick r240633. rdar://problem/47682687
+
+    [watchOS] Enable Parental Controls content filtering
+    https://bugs.webkit.org/show_bug.cgi?id=193939
+    <rdar://problem/46641912>
+    
+    Reviewed by Ryosuke Niwa.
+    
+    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:
+    
+    
+    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@240633 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+    2019-01-28  Andy Estes  <aes...@apple.com>
+
+            [watchOS] Enable Parental Controls content filtering
+            https://bugs.webkit.org/show_bug.cgi?id=193939
+            <rdar://problem/46641912>
+
+            Reviewed by Ryosuke Niwa.
+
+            * wtf/Platform.h:
+
 2019-01-23  Alan Coon  <alanc...@apple.com>
 
         Cherry-pick r240175. rdar://problem/47458146

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


--- branches/safari-607-branch/Source/WTF/wtf/Platform.h	2019-01-31 08:10:30 UTC (rev 240770)
+++ branches/safari-607-branch/Source/WTF/wtf/Platform.h	2019-01-31 08:10:36 UTC (rev 240771)
@@ -1080,6 +1080,9 @@
 
 #if !PLATFORM(WATCHOS) && !PLATFORM(APPLETV) && !PLATFORM(IOSMAC)
 #define ENABLE_DATA_DETECTION 1
+#endif
+
+#if !PLATFORM(APPLETV) && !PLATFORM(IOSMAC)
 #define HAVE_PARENTAL_CONTROLS 1
 #endif

Modified: branches/safari-607-branch/Source/WebCore/ChangeLog (240770 => 240771)


--- branches/safari-607-branch/Source/WebCore/ChangeLog	2019-01-31 08:10:30 UTC (rev 240770)
+++ branches/safari-607-branch/Source/WebCore/ChangeLog	2019-01-31 08:10:36 UTC (rev 240771)
@@ -1,3 +1,54 @@
+2019-01-30  Babak Shafiei  <bshaf...@apple.com>
+
+        Cherry-pick r240633. rdar://problem/47682687
+
+    [watchOS] Enable Parental Controls content filtering
+    https://bugs.webkit.org/show_bug.cgi?id=193939
+    <rdar://problem/46641912>
+    
+    Reviewed by Ryosuke Niwa.
+    
+    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:
+    
+    
+    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@240633 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+    2019-01-28  Andy Estes  <aes...@apple.com>
+
+            [watchOS] Enable Parental Controls content filtering
+            https://bugs.webkit.org/show_bug.cgi?id=193939
+            <rdar://problem/46641912>
+
+            Reviewed by Ryosuke Niwa.
+
+            * Configurations/FeatureDefines.xcconfig:
+
 2019-01-28  Babak Shafiei  <bshaf...@apple.com>
 
         Cherry-pick r240451. rdar://problem/47586844

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


--- branches/safari-607-branch/Source/WebCore/Configurations/FeatureDefines.xcconfig	2019-01-31 08:10:30 UTC (rev 240770)
+++ branches/safari-607-branch/Source/WebCore/Configurations/FeatureDefines.xcconfig	2019-01-31 08:10:36 UTC (rev 240771)
@@ -73,6 +73,8 @@
 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 (240770 => 240771)


--- branches/safari-607-branch/Source/WebCore/PAL/ChangeLog	2019-01-31 08:10:30 UTC (rev 240770)
+++ branches/safari-607-branch/Source/WebCore/PAL/ChangeLog	2019-01-31 08:10:36 UTC (rev 240771)
@@ -1,3 +1,54 @@
+2019-01-30  Babak Shafiei  <bshaf...@apple.com>
+
+        Cherry-pick r240633. rdar://problem/47682687
+
+    [watchOS] Enable Parental Controls content filtering
+    https://bugs.webkit.org/show_bug.cgi?id=193939
+    <rdar://problem/46641912>
+    
+    Reviewed by Ryosuke Niwa.
+    
+    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:
+    
+    
+    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@240633 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+    2019-01-28  Andy Estes  <aes...@apple.com>
+
+            [watchOS] Enable Parental Controls content filtering
+            https://bugs.webkit.org/show_bug.cgi?id=193939
+            <rdar://problem/46641912>
+
+            Reviewed by Ryosuke Niwa.
+
+            * Configurations/FeatureDefines.xcconfig:
+
 2019-01-24  Alan Coon  <alanc...@apple.com>
 
         Cherry-pick r240461. rdar://problem/47536283

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


--- branches/safari-607-branch/Source/WebCore/PAL/Configurations/FeatureDefines.xcconfig	2019-01-31 08:10:30 UTC (rev 240770)
+++ branches/safari-607-branch/Source/WebCore/PAL/Configurations/FeatureDefines.xcconfig	2019-01-31 08:10:36 UTC (rev 240771)
@@ -73,6 +73,8 @@
 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 (240770 => 240771)


--- branches/safari-607-branch/Source/WebKit/ChangeLog	2019-01-31 08:10:30 UTC (rev 240770)
+++ branches/safari-607-branch/Source/WebKit/ChangeLog	2019-01-31 08:10:36 UTC (rev 240771)
@@ -1,5 +1,56 @@
 2019-01-30  Babak Shafiei  <bshaf...@apple.com>
 
+        Cherry-pick r240633. rdar://problem/47682687
+
+    [watchOS] Enable Parental Controls content filtering
+    https://bugs.webkit.org/show_bug.cgi?id=193939
+    <rdar://problem/46641912>
+    
+    Reviewed by Ryosuke Niwa.
+    
+    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:
+    
+    
+    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@240633 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+    2019-01-28  Andy Estes  <aes...@apple.com>
+
+            [watchOS] Enable Parental Controls content filtering
+            https://bugs.webkit.org/show_bug.cgi?id=193939
+            <rdar://problem/46641912>
+
+            Reviewed by Ryosuke Niwa.
+
+            * Configurations/FeatureDefines.xcconfig:
+
+2019-01-30  Babak Shafiei  <bshaf...@apple.com>
+
         Cherry-pick r240729. rdar://problem/47685553
 
     Ensure image picker sourceType is set before cameraDevice

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


--- branches/safari-607-branch/Source/WebKit/Configurations/FeatureDefines.xcconfig	2019-01-31 08:10:30 UTC (rev 240770)
+++ branches/safari-607-branch/Source/WebKit/Configurations/FeatureDefines.xcconfig	2019-01-31 08:10:36 UTC (rev 240771)
@@ -73,6 +73,8 @@
 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 (240770 => 240771)


--- branches/safari-607-branch/Source/WebKitLegacy/mac/ChangeLog	2019-01-31 08:10:30 UTC (rev 240770)
+++ branches/safari-607-branch/Source/WebKitLegacy/mac/ChangeLog	2019-01-31 08:10:36 UTC (rev 240771)
@@ -1,3 +1,54 @@
+2019-01-30  Babak Shafiei  <bshaf...@apple.com>
+
+        Cherry-pick r240633. rdar://problem/47682687
+
+    [watchOS] Enable Parental Controls content filtering
+    https://bugs.webkit.org/show_bug.cgi?id=193939
+    <rdar://problem/46641912>
+    
+    Reviewed by Ryosuke Niwa.
+    
+    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:
+    
+    
+    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@240633 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+    2019-01-28  Andy Estes  <aes...@apple.com>
+
+            [watchOS] Enable Parental Controls content filtering
+            https://bugs.webkit.org/show_bug.cgi?id=193939
+            <rdar://problem/46641912>
+
+            Reviewed by Ryosuke Niwa.
+
+            * Configurations/FeatureDefines.xcconfig:
+
 2019-01-23  Alan Coon  <alanc...@apple.com>
 
         Cherry-pick r239947. rdar://problem/47295371

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


--- branches/safari-607-branch/Source/WebKitLegacy/mac/Configurations/FeatureDefines.xcconfig	2019-01-31 08:10:30 UTC (rev 240770)
+++ branches/safari-607-branch/Source/WebKitLegacy/mac/Configurations/FeatureDefines.xcconfig	2019-01-31 08:10:36 UTC (rev 240771)
@@ -73,6 +73,8 @@
 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 (240770 => 240771)


--- branches/safari-607-branch/Tools/ChangeLog	2019-01-31 08:10:30 UTC (rev 240770)
+++ branches/safari-607-branch/Tools/ChangeLog	2019-01-31 08:10:36 UTC (rev 240771)
@@ -1,3 +1,54 @@
+2019-01-30  Babak Shafiei  <bshaf...@apple.com>
+
+        Cherry-pick r240633. rdar://problem/47682687
+
+    [watchOS] Enable Parental Controls content filtering
+    https://bugs.webkit.org/show_bug.cgi?id=193939
+    <rdar://problem/46641912>
+    
+    Reviewed by Ryosuke Niwa.
+    
+    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:
+    
+    
+    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@240633 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+    2019-01-28  Andy Estes  <aes...@apple.com>
+
+            [watchOS] Enable Parental Controls content filtering
+            https://bugs.webkit.org/show_bug.cgi?id=193939
+            <rdar://problem/46641912>
+
+            Reviewed by Ryosuke Niwa.
+
+            * TestWebKitAPI/Configurations/FeatureDefines.xcconfig:
+
 2019-01-28  Alan Coon  <alanc...@apple.com>
 
         Cherry-pick r240599. rdar://problem/47609799

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


--- branches/safari-607-branch/Tools/TestWebKitAPI/Configurations/FeatureDefines.xcconfig	2019-01-31 08:10:30 UTC (rev 240770)
+++ branches/safari-607-branch/Tools/TestWebKitAPI/Configurations/FeatureDefines.xcconfig	2019-01-31 08:10:36 UTC (rev 240771)
@@ -73,6 +73,8 @@
 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