Diff
Modified: branches/safari-606-branch/Source/_javascript_Core/ChangeLog (234241 => 234242)
--- branches/safari-606-branch/Source/_javascript_Core/ChangeLog 2018-07-26 07:15:02 UTC (rev 234241)
+++ branches/safari-606-branch/Source/_javascript_Core/ChangeLog 2018-07-26 07:15:08 UTC (rev 234242)
@@ -1,3 +1,50 @@
+2018-07-25 Babak Shafiei <[email protected]>
+
+ Cherry-pick r234181. rdar://problem/42604524
+
+ Enable Web Content Filtering on watchOS
+ https://bugs.webkit.org/show_bug.cgi?id=187979
+ <rdar://problem/42559346>
+
+ Reviewed by Wenson Hsieh.
+
+ 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:
+
+ Tools:
+
+ * TestWebKitAPI/Configurations/FeatureDefines.xcconfig:
+
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@234181 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2018-07-24 Tim Horton <[email protected]>
+
+ Enable Web Content Filtering on watchOS
+ https://bugs.webkit.org/show_bug.cgi?id=187979
+ <rdar://problem/42559346>
+
+ Reviewed by Wenson Hsieh.
+
+ * Configurations/FeatureDefines.xcconfig:
+
2018-07-24 Babak Shafiei <[email protected]>
Cherry-pick r234106. rdar://problem/42545682
Modified: branches/safari-606-branch/Source/_javascript_Core/Configurations/FeatureDefines.xcconfig (234241 => 234242)
--- branches/safari-606-branch/Source/_javascript_Core/Configurations/FeatureDefines.xcconfig 2018-07-26 07:15:02 UTC (rev 234241)
+++ branches/safari-606-branch/Source/_javascript_Core/Configurations/FeatureDefines.xcconfig 2018-07-26 07:15:08 UTC (rev 234242)
@@ -62,6 +62,8 @@
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/ChangeLog (234241 => 234242)
--- branches/safari-606-branch/Source/WebCore/ChangeLog 2018-07-26 07:15:02 UTC (rev 234241)
+++ branches/safari-606-branch/Source/WebCore/ChangeLog 2018-07-26 07:15:08 UTC (rev 234242)
@@ -1,5 +1,52 @@
2018-07-25 Babak Shafiei <[email protected]>
+ Cherry-pick r234181. rdar://problem/42604524
+
+ Enable Web Content Filtering on watchOS
+ https://bugs.webkit.org/show_bug.cgi?id=187979
+ <rdar://problem/42559346>
+
+ Reviewed by Wenson Hsieh.
+
+ 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:
+
+ Tools:
+
+ * TestWebKitAPI/Configurations/FeatureDefines.xcconfig:
+
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@234181 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2018-07-24 Tim Horton <[email protected]>
+
+ Enable Web Content Filtering on watchOS
+ https://bugs.webkit.org/show_bug.cgi?id=187979
+ <rdar://problem/42559346>
+
+ Reviewed by Wenson Hsieh.
+
+ * Configurations/FeatureDefines.xcconfig:
+
+2018-07-25 Babak Shafiei <[email protected]>
+
Cherry-pick r234149. rdar://problem/42604679
Cannot view PDF's on my.gov.au: "Refused to load https://my.gov.au/attachment/viewAttachment because it
Modified: branches/safari-606-branch/Source/WebCore/Configurations/FeatureDefines.xcconfig (234241 => 234242)
--- branches/safari-606-branch/Source/WebCore/Configurations/FeatureDefines.xcconfig 2018-07-26 07:15:02 UTC (rev 234241)
+++ branches/safari-606-branch/Source/WebCore/Configurations/FeatureDefines.xcconfig 2018-07-26 07:15:08 UTC (rev 234242)
@@ -62,6 +62,8 @@
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 (234241 => 234242)
--- branches/safari-606-branch/Source/WebCore/PAL/ChangeLog 2018-07-26 07:15:02 UTC (rev 234241)
+++ branches/safari-606-branch/Source/WebCore/PAL/ChangeLog 2018-07-26 07:15:08 UTC (rev 234242)
@@ -1,3 +1,50 @@
+2018-07-25 Babak Shafiei <[email protected]>
+
+ Cherry-pick r234181. rdar://problem/42604524
+
+ Enable Web Content Filtering on watchOS
+ https://bugs.webkit.org/show_bug.cgi?id=187979
+ <rdar://problem/42559346>
+
+ Reviewed by Wenson Hsieh.
+
+ 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:
+
+ Tools:
+
+ * TestWebKitAPI/Configurations/FeatureDefines.xcconfig:
+
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@234181 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2018-07-24 Tim Horton <[email protected]>
+
+ Enable Web Content Filtering on watchOS
+ https://bugs.webkit.org/show_bug.cgi?id=187979
+ <rdar://problem/42559346>
+
+ Reviewed by Wenson Hsieh.
+
+ * Configurations/FeatureDefines.xcconfig:
+
2018-07-20 Babak Shafiei <[email protected]>
Revert r233926. rdar://problem/42446531
Modified: branches/safari-606-branch/Source/WebCore/PAL/Configurations/FeatureDefines.xcconfig (234241 => 234242)
--- branches/safari-606-branch/Source/WebCore/PAL/Configurations/FeatureDefines.xcconfig 2018-07-26 07:15:02 UTC (rev 234241)
+++ branches/safari-606-branch/Source/WebCore/PAL/Configurations/FeatureDefines.xcconfig 2018-07-26 07:15:08 UTC (rev 234242)
@@ -62,6 +62,8 @@
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 (234241 => 234242)
--- branches/safari-606-branch/Source/WebKit/ChangeLog 2018-07-26 07:15:02 UTC (rev 234241)
+++ branches/safari-606-branch/Source/WebKit/ChangeLog 2018-07-26 07:15:08 UTC (rev 234242)
@@ -1,5 +1,52 @@
2018-07-25 Babak Shafiei <[email protected]>
+ Cherry-pick r234181. rdar://problem/42604524
+
+ Enable Web Content Filtering on watchOS
+ https://bugs.webkit.org/show_bug.cgi?id=187979
+ <rdar://problem/42559346>
+
+ Reviewed by Wenson Hsieh.
+
+ 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:
+
+ Tools:
+
+ * TestWebKitAPI/Configurations/FeatureDefines.xcconfig:
+
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@234181 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2018-07-24 Tim Horton <[email protected]>
+
+ Enable Web Content Filtering on watchOS
+ https://bugs.webkit.org/show_bug.cgi?id=187979
+ <rdar://problem/42559346>
+
+ Reviewed by Wenson Hsieh.
+
+ * Configurations/FeatureDefines.xcconfig:
+
+2018-07-25 Babak Shafiei <[email protected]>
+
Cherry-pick r234124. rdar://problem/42604550
Crash when loadViewIfRequired called while WKFullScreenViewController is being deallocated.
Modified: branches/safari-606-branch/Source/WebKit/Configurations/FeatureDefines.xcconfig (234241 => 234242)
--- branches/safari-606-branch/Source/WebKit/Configurations/FeatureDefines.xcconfig 2018-07-26 07:15:02 UTC (rev 234241)
+++ branches/safari-606-branch/Source/WebKit/Configurations/FeatureDefines.xcconfig 2018-07-26 07:15:08 UTC (rev 234242)
@@ -62,6 +62,8 @@
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 (234241 => 234242)
--- branches/safari-606-branch/Source/WebKitLegacy/mac/ChangeLog 2018-07-26 07:15:02 UTC (rev 234241)
+++ branches/safari-606-branch/Source/WebKitLegacy/mac/ChangeLog 2018-07-26 07:15:08 UTC (rev 234242)
@@ -1,5 +1,52 @@
2018-07-25 Babak Shafiei <[email protected]>
+ Cherry-pick r234181. rdar://problem/42604524
+
+ Enable Web Content Filtering on watchOS
+ https://bugs.webkit.org/show_bug.cgi?id=187979
+ <rdar://problem/42559346>
+
+ Reviewed by Wenson Hsieh.
+
+ 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:
+
+ Tools:
+
+ * TestWebKitAPI/Configurations/FeatureDefines.xcconfig:
+
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@234181 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2018-07-24 Tim Horton <[email protected]>
+
+ Enable Web Content Filtering on watchOS
+ https://bugs.webkit.org/show_bug.cgi?id=187979
+ <rdar://problem/42559346>
+
+ Reviewed by Wenson Hsieh.
+
+ * Configurations/FeatureDefines.xcconfig:
+
+2018-07-25 Babak Shafiei <[email protected]>
+
Cherry-pick r234064. rdar://problem/42451634
Picking a color from the color panel for typing attributes needs to inverse transform through color-filter
Modified: branches/safari-606-branch/Source/WebKitLegacy/mac/Configurations/FeatureDefines.xcconfig (234241 => 234242)
--- branches/safari-606-branch/Source/WebKitLegacy/mac/Configurations/FeatureDefines.xcconfig 2018-07-26 07:15:02 UTC (rev 234241)
+++ branches/safari-606-branch/Source/WebKitLegacy/mac/Configurations/FeatureDefines.xcconfig 2018-07-26 07:15:08 UTC (rev 234242)
@@ -62,6 +62,8 @@
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 (234241 => 234242)
--- branches/safari-606-branch/Tools/ChangeLog 2018-07-26 07:15:02 UTC (rev 234241)
+++ branches/safari-606-branch/Tools/ChangeLog 2018-07-26 07:15:08 UTC (rev 234242)
@@ -1,5 +1,52 @@
2018-07-25 Babak Shafiei <[email protected]>
+ Cherry-pick r234181. rdar://problem/42604524
+
+ Enable Web Content Filtering on watchOS
+ https://bugs.webkit.org/show_bug.cgi?id=187979
+ <rdar://problem/42559346>
+
+ Reviewed by Wenson Hsieh.
+
+ 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:
+
+ Tools:
+
+ * TestWebKitAPI/Configurations/FeatureDefines.xcconfig:
+
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@234181 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2018-07-24 Tim Horton <[email protected]>
+
+ Enable Web Content Filtering on watchOS
+ https://bugs.webkit.org/show_bug.cgi?id=187979
+ <rdar://problem/42559346>
+
+ Reviewed by Wenson Hsieh.
+
+ * TestWebKitAPI/Configurations/FeatureDefines.xcconfig:
+
+2018-07-25 Babak Shafiei <[email protected]>
+
Cherry-pick r234111. rdar://problem/42604691
WebResourceLoadStatisticsStore fails to unregister itself as a MessageReceiver in its destructor
Modified: branches/safari-606-branch/Tools/TestWebKitAPI/Configurations/FeatureDefines.xcconfig (234241 => 234242)
--- branches/safari-606-branch/Tools/TestWebKitAPI/Configurations/FeatureDefines.xcconfig 2018-07-26 07:15:02 UTC (rev 234241)
+++ branches/safari-606-branch/Tools/TestWebKitAPI/Configurations/FeatureDefines.xcconfig 2018-07-26 07:15:08 UTC (rev 234242)
@@ -62,6 +62,8 @@
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;
