Attachment 346009 Details for Bug 188075 – Patch

[patch] Patch

bug-188075-20180728215412.patch (text/plain), 13.70 KB, created by Andy Estes on 2018-07-28 21:54:13 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Andy Estes

Created: 2018-07-28 21:54:13 PDT

Size: 13.70 KB

patch

obsolete

>Subversion Revision: 234272
>diff --git a/Source/JavaScriptCore/ChangeLog b/Source/JavaScriptCore/ChangeLog
>index 5ea0082297f8986aa07438cd69c3da66a3f0527e..db0a4776005f2aaad4a0a92dff7a6912eb3cdb77 100644
>--- a/Source/JavaScriptCore/ChangeLog
>+++ b/Source/JavaScriptCore/ChangeLog
>@@ -1,3 +1,21 @@
>+2018-07-26  Commit Queue  <commit-queue@webkit.org>
>+
>+        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  Andy VanWagoner  <andy@vanwagoner.family>
> 
>         [INTL] Call Typed Array elements toLocaleString with locale and options
>diff --git a/Source/WTF/ChangeLog b/Source/WTF/ChangeLog
>index 52ada99d91168683a2742f4ead1d1df42aaa74d3..d3a9b8c21f34dfda49e345c427718446bd5bd8e8 100644
>--- a/Source/WTF/ChangeLog
>+++ b/Source/WTF/ChangeLog
>@@ -1,3 +1,21 @@
>+2018-07-26  Commit Queue  <commit-queue@webkit.org>
>+
>+        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  Tomas Popela  <tpopela@redhat.com>
> 
>         Correctly close the variable argument list
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index e16c2a630fba747f0f52ebd07183f6e7cca57d3f..0a10a860befe48cc5a062a4b7a5b24bd8671e9ac 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,21 @@
>+2018-07-26  Commit Queue  <commit-queue@webkit.org>
>+
>+        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  Chris Dumez  <cdumez@apple.com>
> 
>         Allow ActiveDOMObject's canSuspend / suspend / resume overrides to destroy ActiveDOMObjects
>diff --git a/Source/WebCore/PAL/ChangeLog b/Source/WebCore/PAL/ChangeLog
>index 5fd6e9308ebde9fd5e4f0d7b4347ce45b886a8c4..be2cc616c19837264cdfc396f27e2e72de333735 100644
>--- a/Source/WebCore/PAL/ChangeLog
>+++ b/Source/WebCore/PAL/ChangeLog
>@@ -1,3 +1,21 @@
>+2018-07-26  Commit Queue  <commit-queue@webkit.org>
>+
>+        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-24  Tim Horton  <timothy_horton@apple.com>
> 
>         Enable Web Content Filtering on watchOS
>diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
>index a7252eee19ddc7797b3329ecbf95d0aaaedea73c..c174e0472b2f9e10e93c819b330f16dd53f6c064 100644
>--- a/Source/WebKit/ChangeLog
>+++ b/Source/WebKit/ChangeLog
>@@ -1,3 +1,33 @@
>+2018-07-28  Andy Estes  <aestes@apple.com>
>+
>+        [Wi-Fi Assertions] Pass a ResumptionReason to resumeWiFiAssertions
>+        https://bugs.webkit.org/show_bug.cgi?id=188142
>+        <rdar://problem/42628842>
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * NetworkProcess/cocoa/NetworkProcessCocoa.mm:
>+        (WebKit::NetworkProcess::platformProcessDidResume):
>+        (WebKit::NetworkProcess::platformProcessDidTransitionToForeground):
>+
>+2018-07-26  Commit Queue  <commit-queue@webkit.org>
>+
>+        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  Brent Fulgham  <bfulgham@apple.com>
> 
>         [macOS] Update sandboxes for revised OpenCL calls and streaming media
>diff --git a/Source/WebKitLegacy/mac/ChangeLog b/Source/WebKitLegacy/mac/ChangeLog
>index 3c0f9ccfa78bd761c41b5f8f0948690a818a063b..8e82ef80b6e412cf1fbdbdc7256de2a35ca0952c 100644
>--- a/Source/WebKitLegacy/mac/ChangeLog
>+++ b/Source/WebKitLegacy/mac/ChangeLog
>@@ -1,3 +1,21 @@
>+2018-07-26  Commit Queue  <commit-queue@webkit.org>
>+
>+        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  Chris Dumez  <cdumez@apple.com>
> 
>         navigator.userAgent may return outdated value after webView.customUserAgent is set
>diff --git a/Source/JavaScriptCore/Configurations/FeatureDefines.xcconfig b/Source/JavaScriptCore/Configurations/FeatureDefines.xcconfig
>index b65dbefe6569807b03a3ee48eb146fb33a596016..08099785c1842395361d55b0ea1a9b310dbd95c4 100644
>--- a/Source/JavaScriptCore/Configurations/FeatureDefines.xcconfig
>+++ b/Source/JavaScriptCore/Configurations/FeatureDefines.xcconfig
>@@ -62,8 +62,6 @@ ENABLE_CACHE_PARTITIONING = ENABLE_CACHE_PARTITIONING;
> 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;
>diff --git a/Source/WTF/wtf/Platform.h b/Source/WTF/wtf/Platform.h
>index 18fa82ff3580b872402143ad0b7c52887fba2816..3700364cbe2a187aadf8c6f174eb6fac21016940 100644
>--- a/Source/WTF/wtf/Platform.h
>+++ b/Source/WTF/wtf/Platform.h
>@@ -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
> 
>diff --git a/Source/WebCore/Configurations/FeatureDefines.xcconfig b/Source/WebCore/Configurations/FeatureDefines.xcconfig
>index b65dbefe6569807b03a3ee48eb146fb33a596016..08099785c1842395361d55b0ea1a9b310dbd95c4 100644
>--- a/Source/WebCore/Configurations/FeatureDefines.xcconfig
>+++ b/Source/WebCore/Configurations/FeatureDefines.xcconfig
>@@ -62,8 +62,6 @@ ENABLE_CACHE_PARTITIONING = ENABLE_CACHE_PARTITIONING;
> 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;
>diff --git a/Source/WebCore/PAL/Configurations/FeatureDefines.xcconfig b/Source/WebCore/PAL/Configurations/FeatureDefines.xcconfig
>index b65dbefe6569807b03a3ee48eb146fb33a596016..08099785c1842395361d55b0ea1a9b310dbd95c4 100644
>--- a/Source/WebCore/PAL/Configurations/FeatureDefines.xcconfig
>+++ b/Source/WebCore/PAL/Configurations/FeatureDefines.xcconfig
>@@ -62,8 +62,6 @@ ENABLE_CACHE_PARTITIONING = ENABLE_CACHE_PARTITIONING;
> 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;
>diff --git a/Source/WebKit/Configurations/FeatureDefines.xcconfig b/Source/WebKit/Configurations/FeatureDefines.xcconfig
>index b65dbefe6569807b03a3ee48eb146fb33a596016..08099785c1842395361d55b0ea1a9b310dbd95c4 100644
>--- a/Source/WebKit/Configurations/FeatureDefines.xcconfig
>+++ b/Source/WebKit/Configurations/FeatureDefines.xcconfig
>@@ -62,8 +62,6 @@ ENABLE_CACHE_PARTITIONING = ENABLE_CACHE_PARTITIONING;
> 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;
>diff --git a/Source/WebKit/NetworkProcess/cocoa/NetworkProcessCocoa.mm b/Source/WebKit/NetworkProcess/cocoa/NetworkProcessCocoa.mm
>index b7b07f7cf23885d019e25c9b3cd677c1f2229373..330ae446524716d0603a498f91d1997716ffa0a5 100644
>--- a/Source/WebKit/NetworkProcess/cocoa/NetworkProcessCocoa.mm
>+++ b/Source/WebKit/NetworkProcess/cocoa/NetworkProcessCocoa.mm
>@@ -221,7 +221,7 @@ void NetworkProcess::platformPrepareToSuspend()
> void NetworkProcess::platformProcessDidResume()
> {
> #if ENABLE(WIFI_ASSERTIONS)
>-    resumeWiFiAssertions();
>+    resumeWiFiAssertions(ResumptionReason::ProcessResuming);
> #endif
> }
> 
>@@ -235,7 +235,7 @@ void NetworkProcess::platformProcessDidTransitionToBackground()
> void NetworkProcess::platformProcessDidTransitionToForeground()
> {
> #if ENABLE(WIFI_ASSERTIONS)
>-    resumeWiFiAssertions();
>+    resumeWiFiAssertions(ResumptionReason::ProcessForegrounding);
> #endif
> }
> 
>diff --git a/Source/WebKitLegacy/mac/Configurations/FeatureDefines.xcconfig b/Source/WebKitLegacy/mac/Configurations/FeatureDefines.xcconfig
>index b65dbefe6569807b03a3ee48eb146fb33a596016..08099785c1842395361d55b0ea1a9b310dbd95c4 100644
>--- a/Source/WebKitLegacy/mac/Configurations/FeatureDefines.xcconfig
>+++ b/Source/WebKitLegacy/mac/Configurations/FeatureDefines.xcconfig
>@@ -62,8 +62,6 @@ ENABLE_CACHE_PARTITIONING = ENABLE_CACHE_PARTITIONING;
> 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;
>diff --git a/Tools/ChangeLog b/Tools/ChangeLog
>index 1db6131902bc6228836d892e837fd76fb4c0c918..e04b20f58cf3641020f5f5aaddf07ce43f4b5973 100644
>--- a/Tools/ChangeLog
>+++ b/Tools/ChangeLog
>@@ -1,3 +1,21 @@
>+2018-07-26  Commit Queue  <commit-queue@webkit.org>
>+
>+        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  Aakash Jain  <aakash_jain@apple.com>
> 
>         [ews-build] Add build steps DownloadBuiltProduct and ExtractBuiltProduct
>diff --git a/Tools/TestWebKitAPI/Configurations/FeatureDefines.xcconfig b/Tools/TestWebKitAPI/Configurations/FeatureDefines.xcconfig
>index b65dbefe6569807b03a3ee48eb146fb33a596016..08099785c1842395361d55b0ea1a9b310dbd95c4 100644
>--- a/Tools/TestWebKitAPI/Configurations/FeatureDefines.xcconfig
>+++ b/Tools/TestWebKitAPI/Configurations/FeatureDefines.xcconfig
>@@ -62,8 +62,6 @@ ENABLE_CACHE_PARTITIONING = ENABLE_CACHE_PARTITIONING;
> 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;

Actions: View | Formatted Diff | Diff

Attachments on bug 188075: 345864 | 346009