Diff
Modified: branches/safari-606-branch/Source/_javascript_Core/ChangeLog (234284 => 234285)
--- branches/safari-606-branch/Source/_javascript_Core/ChangeLog 2018-07-27 00:42:33 UTC (rev 234284)
+++ branches/safari-606-branch/Source/_javascript_Core/ChangeLog 2018-07-27 01:02:39 UTC (rev 234285)
@@ -1,3 +1,43 @@
+2018-07-26 Babak Shafiei <[email protected]>
+
+ Cherry-pick r234272. rdar://problem/42645434
+
+ Unreviewed, rolling out r234181 and r234189.
+ https://bugs.webkit.org/show_bug.cgi?id=188075
+
+ These are not needed right now (Requested by thorton on
+ #webkit).
+
+ Reverted changesets:
+
+ "Enable Web Content Filtering on watchOS"
+ https://bugs.webkit.org/show_bug.cgi?id=187979
+ https://trac.webkit.org/changeset/234181
+
+ "HAVE(PARENTAL_CONTROLS) should be true on watchOS"
+ https://bugs.webkit.org/show_bug.cgi?id=187985
+ https://trac.webkit.org/changeset/234189
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@234272 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2018-07-26 Commit Queue <[email protected]>
+
+ Unreviewed, rolling out r234181 and r234189.
+ https://bugs.webkit.org/show_bug.cgi?id=188075
+
+ These are not needed right now (Requested by thorton on
+ #webkit).
+
+ Reverted changesets:
+
+ "Enable Web Content Filtering on watchOS"
+ https://bugs.webkit.org/show_bug.cgi?id=187979
+ https://trac.webkit.org/changeset/234181
+
+ "HAVE(PARENTAL_CONTROLS) should be true on watchOS"
+ https://bugs.webkit.org/show_bug.cgi?id=187985
+ https://trac.webkit.org/changeset/234189
+
2018-07-25 Babak Shafiei <[email protected]>
Cherry-pick r234181. rdar://problem/42604524
Modified: branches/safari-606-branch/Source/_javascript_Core/Configurations/FeatureDefines.xcconfig (234284 => 234285)
--- branches/safari-606-branch/Source/_javascript_Core/Configurations/FeatureDefines.xcconfig 2018-07-27 00:42:33 UTC (rev 234284)
+++ branches/safari-606-branch/Source/_javascript_Core/Configurations/FeatureDefines.xcconfig 2018-07-27 01:02:39 UTC (rev 234285)
@@ -62,8 +62,6 @@
ENABLE_CHANNEL_MESSAGING = ENABLE_CHANNEL_MESSAGING;
ENABLE_CONTENT_FILTERING = $(ENABLE_CONTENT_FILTERING_$(WK_PLATFORM_NAME));
-ENABLE_CONTENT_FILTERING_watchos = ENABLE_CONTENT_FILTERING;
-ENABLE_CONTENT_FILTERING_watchsimulator = ENABLE_CONTENT_FILTERING;
ENABLE_CONTENT_FILTERING_iphoneos = ENABLE_CONTENT_FILTERING;
ENABLE_CONTENT_FILTERING_iphonesimulator = ENABLE_CONTENT_FILTERING;
ENABLE_CONTENT_FILTERING_macosx = ENABLE_CONTENT_FILTERING;
Modified: branches/safari-606-branch/Source/WTF/ChangeLog (234284 => 234285)
--- branches/safari-606-branch/Source/WTF/ChangeLog 2018-07-27 00:42:33 UTC (rev 234284)
+++ branches/safari-606-branch/Source/WTF/ChangeLog 2018-07-27 01:02:39 UTC (rev 234285)
@@ -1,3 +1,43 @@
+2018-07-26 Babak Shafiei <[email protected]>
+
+ Cherry-pick r234272. rdar://problem/42645434
+
+ Unreviewed, rolling out r234181 and r234189.
+ https://bugs.webkit.org/show_bug.cgi?id=188075
+
+ These are not needed right now (Requested by thorton on
+ #webkit).
+
+ Reverted changesets:
+
+ "Enable Web Content Filtering on watchOS"
+ https://bugs.webkit.org/show_bug.cgi?id=187979
+ https://trac.webkit.org/changeset/234181
+
+ "HAVE(PARENTAL_CONTROLS) should be true on watchOS"
+ https://bugs.webkit.org/show_bug.cgi?id=187985
+ https://trac.webkit.org/changeset/234189
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@234272 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2018-07-26 Commit Queue <[email protected]>
+
+ Unreviewed, rolling out r234181 and r234189.
+ https://bugs.webkit.org/show_bug.cgi?id=188075
+
+ These are not needed right now (Requested by thorton on
+ #webkit).
+
+ Reverted changesets:
+
+ "Enable Web Content Filtering on watchOS"
+ https://bugs.webkit.org/show_bug.cgi?id=187979
+ https://trac.webkit.org/changeset/234181
+
+ "HAVE(PARENTAL_CONTROLS) should be true on watchOS"
+ https://bugs.webkit.org/show_bug.cgi?id=187985
+ https://trac.webkit.org/changeset/234189
+
2018-07-25 Babak Shafiei <[email protected]>
Cherry-pick r234189. rdar://problem/42604524
Modified: branches/safari-606-branch/Source/WTF/wtf/Platform.h (234284 => 234285)
--- branches/safari-606-branch/Source/WTF/wtf/Platform.h 2018-07-27 00:42:33 UTC (rev 234284)
+++ branches/safari-606-branch/Source/WTF/wtf/Platform.h 2018-07-27 01:02:39 UTC (rev 234285)
@@ -1044,9 +1044,6 @@
#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-606-branch/Source/WebCore/ChangeLog (234284 => 234285)
--- branches/safari-606-branch/Source/WebCore/ChangeLog 2018-07-27 00:42:33 UTC (rev 234284)
+++ branches/safari-606-branch/Source/WebCore/ChangeLog 2018-07-27 01:02:39 UTC (rev 234285)
@@ -1,3 +1,43 @@
+2018-07-26 Babak Shafiei <[email protected]>
+
+ Cherry-pick r234272. rdar://problem/42645434
+
+ Unreviewed, rolling out r234181 and r234189.
+ https://bugs.webkit.org/show_bug.cgi?id=188075
+
+ These are not needed right now (Requested by thorton on
+ #webkit).
+
+ Reverted changesets:
+
+ "Enable Web Content Filtering on watchOS"
+ https://bugs.webkit.org/show_bug.cgi?id=187979
+ https://trac.webkit.org/changeset/234181
+
+ "HAVE(PARENTAL_CONTROLS) should be true on watchOS"
+ https://bugs.webkit.org/show_bug.cgi?id=187985
+ https://trac.webkit.org/changeset/234189
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@234272 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2018-07-26 Commit Queue <[email protected]>
+
+ Unreviewed, rolling out r234181 and r234189.
+ https://bugs.webkit.org/show_bug.cgi?id=188075
+
+ These are not needed right now (Requested by thorton on
+ #webkit).
+
+ Reverted changesets:
+
+ "Enable Web Content Filtering on watchOS"
+ https://bugs.webkit.org/show_bug.cgi?id=187979
+ https://trac.webkit.org/changeset/234181
+
+ "HAVE(PARENTAL_CONTROLS) should be true on watchOS"
+ https://bugs.webkit.org/show_bug.cgi?id=187985
+ https://trac.webkit.org/changeset/234189
+
2018-07-25 Babak Shafiei <[email protected]>
Cherry-pick r234222. rdar://problem/42612113
Modified: branches/safari-606-branch/Source/WebCore/Configurations/FeatureDefines.xcconfig (234284 => 234285)
--- branches/safari-606-branch/Source/WebCore/Configurations/FeatureDefines.xcconfig 2018-07-27 00:42:33 UTC (rev 234284)
+++ branches/safari-606-branch/Source/WebCore/Configurations/FeatureDefines.xcconfig 2018-07-27 01:02:39 UTC (rev 234285)
@@ -62,8 +62,6 @@
ENABLE_CHANNEL_MESSAGING = ENABLE_CHANNEL_MESSAGING;
ENABLE_CONTENT_FILTERING = $(ENABLE_CONTENT_FILTERING_$(WK_PLATFORM_NAME));
-ENABLE_CONTENT_FILTERING_watchos = ENABLE_CONTENT_FILTERING;
-ENABLE_CONTENT_FILTERING_watchsimulator = ENABLE_CONTENT_FILTERING;
ENABLE_CONTENT_FILTERING_iphoneos = ENABLE_CONTENT_FILTERING;
ENABLE_CONTENT_FILTERING_iphonesimulator = ENABLE_CONTENT_FILTERING;
ENABLE_CONTENT_FILTERING_macosx = ENABLE_CONTENT_FILTERING;
Modified: branches/safari-606-branch/Source/WebCore/PAL/ChangeLog (234284 => 234285)
--- branches/safari-606-branch/Source/WebCore/PAL/ChangeLog 2018-07-27 00:42:33 UTC (rev 234284)
+++ branches/safari-606-branch/Source/WebCore/PAL/ChangeLog 2018-07-27 01:02:39 UTC (rev 234285)
@@ -1,3 +1,43 @@
+2018-07-26 Babak Shafiei <[email protected]>
+
+ Cherry-pick r234272. rdar://problem/42645434
+
+ Unreviewed, rolling out r234181 and r234189.
+ https://bugs.webkit.org/show_bug.cgi?id=188075
+
+ These are not needed right now (Requested by thorton on
+ #webkit).
+
+ Reverted changesets:
+
+ "Enable Web Content Filtering on watchOS"
+ https://bugs.webkit.org/show_bug.cgi?id=187979
+ https://trac.webkit.org/changeset/234181
+
+ "HAVE(PARENTAL_CONTROLS) should be true on watchOS"
+ https://bugs.webkit.org/show_bug.cgi?id=187985
+ https://trac.webkit.org/changeset/234189
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@234272 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2018-07-26 Commit Queue <[email protected]>
+
+ Unreviewed, rolling out r234181 and r234189.
+ https://bugs.webkit.org/show_bug.cgi?id=188075
+
+ These are not needed right now (Requested by thorton on
+ #webkit).
+
+ Reverted changesets:
+
+ "Enable Web Content Filtering on watchOS"
+ https://bugs.webkit.org/show_bug.cgi?id=187979
+ https://trac.webkit.org/changeset/234181
+
+ "HAVE(PARENTAL_CONTROLS) should be true on watchOS"
+ https://bugs.webkit.org/show_bug.cgi?id=187985
+ https://trac.webkit.org/changeset/234189
+
2018-07-25 Babak Shafiei <[email protected]>
Cherry-pick r234181. rdar://problem/42604524
Modified: branches/safari-606-branch/Source/WebCore/PAL/Configurations/FeatureDefines.xcconfig (234284 => 234285)
--- branches/safari-606-branch/Source/WebCore/PAL/Configurations/FeatureDefines.xcconfig 2018-07-27 00:42:33 UTC (rev 234284)
+++ branches/safari-606-branch/Source/WebCore/PAL/Configurations/FeatureDefines.xcconfig 2018-07-27 01:02:39 UTC (rev 234285)
@@ -62,8 +62,6 @@
ENABLE_CHANNEL_MESSAGING = ENABLE_CHANNEL_MESSAGING;
ENABLE_CONTENT_FILTERING = $(ENABLE_CONTENT_FILTERING_$(WK_PLATFORM_NAME));
-ENABLE_CONTENT_FILTERING_watchos = ENABLE_CONTENT_FILTERING;
-ENABLE_CONTENT_FILTERING_watchsimulator = ENABLE_CONTENT_FILTERING;
ENABLE_CONTENT_FILTERING_iphoneos = ENABLE_CONTENT_FILTERING;
ENABLE_CONTENT_FILTERING_iphonesimulator = ENABLE_CONTENT_FILTERING;
ENABLE_CONTENT_FILTERING_macosx = ENABLE_CONTENT_FILTERING;
Modified: branches/safari-606-branch/Source/WebKit/ChangeLog (234284 => 234285)
--- branches/safari-606-branch/Source/WebKit/ChangeLog 2018-07-27 00:42:33 UTC (rev 234284)
+++ branches/safari-606-branch/Source/WebKit/ChangeLog 2018-07-27 01:02:39 UTC (rev 234285)
@@ -1,3 +1,43 @@
+2018-07-26 Babak Shafiei <[email protected]>
+
+ Cherry-pick r234272. rdar://problem/42645434
+
+ Unreviewed, rolling out r234181 and r234189.
+ https://bugs.webkit.org/show_bug.cgi?id=188075
+
+ These are not needed right now (Requested by thorton on
+ #webkit).
+
+ Reverted changesets:
+
+ "Enable Web Content Filtering on watchOS"
+ https://bugs.webkit.org/show_bug.cgi?id=187979
+ https://trac.webkit.org/changeset/234181
+
+ "HAVE(PARENTAL_CONTROLS) should be true on watchOS"
+ https://bugs.webkit.org/show_bug.cgi?id=187985
+ https://trac.webkit.org/changeset/234189
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@234272 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2018-07-26 Commit Queue <[email protected]>
+
+ Unreviewed, rolling out r234181 and r234189.
+ https://bugs.webkit.org/show_bug.cgi?id=188075
+
+ These are not needed right now (Requested by thorton on
+ #webkit).
+
+ Reverted changesets:
+
+ "Enable Web Content Filtering on watchOS"
+ https://bugs.webkit.org/show_bug.cgi?id=187979
+ https://trac.webkit.org/changeset/234181
+
+ "HAVE(PARENTAL_CONTROLS) should be true on watchOS"
+ https://bugs.webkit.org/show_bug.cgi?id=187985
+ https://trac.webkit.org/changeset/234189
+
2018-07-25 Babak Shafiei <[email protected]>
Cherry-pick r234216. rdar://problem/42604537
Modified: branches/safari-606-branch/Source/WebKit/Configurations/FeatureDefines.xcconfig (234284 => 234285)
--- branches/safari-606-branch/Source/WebKit/Configurations/FeatureDefines.xcconfig 2018-07-27 00:42:33 UTC (rev 234284)
+++ branches/safari-606-branch/Source/WebKit/Configurations/FeatureDefines.xcconfig 2018-07-27 01:02:39 UTC (rev 234285)
@@ -62,8 +62,6 @@
ENABLE_CHANNEL_MESSAGING = ENABLE_CHANNEL_MESSAGING;
ENABLE_CONTENT_FILTERING = $(ENABLE_CONTENT_FILTERING_$(WK_PLATFORM_NAME));
-ENABLE_CONTENT_FILTERING_watchos = ENABLE_CONTENT_FILTERING;
-ENABLE_CONTENT_FILTERING_watchsimulator = ENABLE_CONTENT_FILTERING;
ENABLE_CONTENT_FILTERING_iphoneos = ENABLE_CONTENT_FILTERING;
ENABLE_CONTENT_FILTERING_iphonesimulator = ENABLE_CONTENT_FILTERING;
ENABLE_CONTENT_FILTERING_macosx = ENABLE_CONTENT_FILTERING;
Modified: branches/safari-606-branch/Source/WebKitLegacy/mac/ChangeLog (234284 => 234285)
--- branches/safari-606-branch/Source/WebKitLegacy/mac/ChangeLog 2018-07-27 00:42:33 UTC (rev 234284)
+++ branches/safari-606-branch/Source/WebKitLegacy/mac/ChangeLog 2018-07-27 01:02:39 UTC (rev 234285)
@@ -1,3 +1,43 @@
+2018-07-26 Babak Shafiei <[email protected]>
+
+ Cherry-pick r234272. rdar://problem/42645434
+
+ Unreviewed, rolling out r234181 and r234189.
+ https://bugs.webkit.org/show_bug.cgi?id=188075
+
+ These are not needed right now (Requested by thorton on
+ #webkit).
+
+ Reverted changesets:
+
+ "Enable Web Content Filtering on watchOS"
+ https://bugs.webkit.org/show_bug.cgi?id=187979
+ https://trac.webkit.org/changeset/234181
+
+ "HAVE(PARENTAL_CONTROLS) should be true on watchOS"
+ https://bugs.webkit.org/show_bug.cgi?id=187985
+ https://trac.webkit.org/changeset/234189
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@234272 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2018-07-26 Commit Queue <[email protected]>
+
+ Unreviewed, rolling out r234181 and r234189.
+ https://bugs.webkit.org/show_bug.cgi?id=188075
+
+ These are not needed right now (Requested by thorton on
+ #webkit).
+
+ Reverted changesets:
+
+ "Enable Web Content Filtering on watchOS"
+ https://bugs.webkit.org/show_bug.cgi?id=187979
+ https://trac.webkit.org/changeset/234181
+
+ "HAVE(PARENTAL_CONTROLS) should be true on watchOS"
+ https://bugs.webkit.org/show_bug.cgi?id=187985
+ https://trac.webkit.org/changeset/234189
+
2018-07-25 Babak Shafiei <[email protected]>
Cherry-pick r234181. rdar://problem/42604524
Modified: branches/safari-606-branch/Source/WebKitLegacy/mac/Configurations/FeatureDefines.xcconfig (234284 => 234285)
--- branches/safari-606-branch/Source/WebKitLegacy/mac/Configurations/FeatureDefines.xcconfig 2018-07-27 00:42:33 UTC (rev 234284)
+++ branches/safari-606-branch/Source/WebKitLegacy/mac/Configurations/FeatureDefines.xcconfig 2018-07-27 01:02:39 UTC (rev 234285)
@@ -62,8 +62,6 @@
ENABLE_CHANNEL_MESSAGING = ENABLE_CHANNEL_MESSAGING;
ENABLE_CONTENT_FILTERING = $(ENABLE_CONTENT_FILTERING_$(WK_PLATFORM_NAME));
-ENABLE_CONTENT_FILTERING_watchos = ENABLE_CONTENT_FILTERING;
-ENABLE_CONTENT_FILTERING_watchsimulator = ENABLE_CONTENT_FILTERING;
ENABLE_CONTENT_FILTERING_iphoneos = ENABLE_CONTENT_FILTERING;
ENABLE_CONTENT_FILTERING_iphonesimulator = ENABLE_CONTENT_FILTERING;
ENABLE_CONTENT_FILTERING_macosx = ENABLE_CONTENT_FILTERING;
Modified: branches/safari-606-branch/Tools/ChangeLog (234284 => 234285)
--- branches/safari-606-branch/Tools/ChangeLog 2018-07-27 00:42:33 UTC (rev 234284)
+++ branches/safari-606-branch/Tools/ChangeLog 2018-07-27 01:02:39 UTC (rev 234285)
@@ -1,3 +1,43 @@
+2018-07-26 Babak Shafiei <[email protected]>
+
+ Cherry-pick r234272. rdar://problem/42645434
+
+ Unreviewed, rolling out r234181 and r234189.
+ https://bugs.webkit.org/show_bug.cgi?id=188075
+
+ These are not needed right now (Requested by thorton on
+ #webkit).
+
+ Reverted changesets:
+
+ "Enable Web Content Filtering on watchOS"
+ https://bugs.webkit.org/show_bug.cgi?id=187979
+ https://trac.webkit.org/changeset/234181
+
+ "HAVE(PARENTAL_CONTROLS) should be true on watchOS"
+ https://bugs.webkit.org/show_bug.cgi?id=187985
+ https://trac.webkit.org/changeset/234189
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@234272 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2018-07-26 Commit Queue <[email protected]>
+
+ Unreviewed, rolling out r234181 and r234189.
+ https://bugs.webkit.org/show_bug.cgi?id=188075
+
+ These are not needed right now (Requested by thorton on
+ #webkit).
+
+ Reverted changesets:
+
+ "Enable Web Content Filtering on watchOS"
+ https://bugs.webkit.org/show_bug.cgi?id=187979
+ https://trac.webkit.org/changeset/234181
+
+ "HAVE(PARENTAL_CONTROLS) should be true on watchOS"
+ https://bugs.webkit.org/show_bug.cgi?id=187985
+ https://trac.webkit.org/changeset/234189
+
2018-07-25 Babak Shafiei <[email protected]>
Cherry-pick r234181. rdar://problem/42604524
Modified: branches/safari-606-branch/Tools/TestWebKitAPI/Configurations/FeatureDefines.xcconfig (234284 => 234285)
--- branches/safari-606-branch/Tools/TestWebKitAPI/Configurations/FeatureDefines.xcconfig 2018-07-27 00:42:33 UTC (rev 234284)
+++ branches/safari-606-branch/Tools/TestWebKitAPI/Configurations/FeatureDefines.xcconfig 2018-07-27 01:02:39 UTC (rev 234285)
@@ -62,8 +62,6 @@
ENABLE_CHANNEL_MESSAGING = ENABLE_CHANNEL_MESSAGING;
ENABLE_CONTENT_FILTERING = $(ENABLE_CONTENT_FILTERING_$(WK_PLATFORM_NAME));
-ENABLE_CONTENT_FILTERING_watchos = ENABLE_CONTENT_FILTERING;
-ENABLE_CONTENT_FILTERING_watchsimulator = ENABLE_CONTENT_FILTERING;
ENABLE_CONTENT_FILTERING_iphoneos = ENABLE_CONTENT_FILTERING;
ENABLE_CONTENT_FILTERING_iphonesimulator = ENABLE_CONTENT_FILTERING;
ENABLE_CONTENT_FILTERING_macosx = ENABLE_CONTENT_FILTERING;