Attachment 372772 Details for Bug 199164 – Patch

[patch] Patch

bug-199164-20190624111158.patch (text/plain), 10.34 KB, created by John Wilander on 2019-06-24 11:11:59 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: John Wilander

Created: 2019-06-24 11:11:59 PDT

Size: 10.34 KB

patch

obsolete

>Subversion Revision: 246738
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index 9d44f8e3995e16229fb3612f743fbe29129765b1..bfff7ffaccef605fa5241d37cd85c2b462b84418 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,21 @@
>+2019-06-24  John Wilander  <wilander@apple.com>
>+
>+        Remove IsITPFirstPartyWebsiteDataRemovalEnabled as runtime check
>+        https://bugs.webkit.org/show_bug.cgi?id=199164
>+        <rdar://problem/52061147>
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        No new tests. Just a removal of a runtime feature check. The functionality
>+        already has a layout test.
>+
>+        We've had this toggle as a safety thing since mid-March. No need for it any longer.
>+
>+        * page/RuntimeEnabledFeatures.h:
>+        (WebCore::RuntimeEnabledFeatures::isITPDatabaseEnabled const):
>+        (WebCore::RuntimeEnabledFeatures::setIsITPFirstPartyWebsiteDataRemovalEnabled): Deleted.
>+        (WebCore::RuntimeEnabledFeatures::isITPFirstPartyWebsiteDataRemovalEnabled const): Deleted.
>+
> 2019-06-24  Greg Doolittle  <gr3g@apple.com>
> 
>         Web Inspector: AXI: Audit: image label test is throwing spurious errors on elements with existing alt attr, but no value: <img alt>
>diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
>index ceef29db7eea4117e0f6452944210c65c3c5f7e5..aab98db318e6c3a2389d7cc5c34c7c36054cb5c8 100644
>--- a/Source/WebKit/ChangeLog
>+++ b/Source/WebKit/ChangeLog
>@@ -1,3 +1,25 @@
>+2019-06-24  John Wilander  <wilander@apple.com>
>+
>+        Remove IsITPFirstPartyWebsiteDataRemovalEnabled as runtime check
>+        https://bugs.webkit.org/show_bug.cgi?id=199164
>+        <rdar://problem/52061147>
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        We've had this toggle as a safety thing since mid-March. No need for it any longer.
>+
>+        * NetworkProcess/Classifier/ResourceLoadStatisticsMemoryStore.cpp:
>+        (WebKit::ResourceLoadStatisticsMemoryStore::shouldRemoveAllButCookiesFor const):
>+        * NetworkProcess/NetworkProcess.cpp:
>+        (WebKit::NetworkProcess::initializeNetworkProcess):
>+        * NetworkProcess/NetworkProcessCreationParameters.cpp:
>+        (WebKit::NetworkProcessCreationParameters::encode const):
>+        (WebKit::NetworkProcessCreationParameters::decode):
>+        * NetworkProcess/NetworkProcessCreationParameters.h:
>+        * Shared/WebPreferences.yaml:
>+        * UIProcess/Cocoa/WebProcessPoolCocoa.mm:
>+        (WebKit::WebProcessPool::platformInitializeNetworkProcess):
>+
> 2019-06-24  Adrian Perez de Castro  <aperez@igalia.com>
> 
>         [WPE][GTK] Fixes for compilation with unified builds disabled
>diff --git a/Source/WebCore/page/RuntimeEnabledFeatures.h b/Source/WebCore/page/RuntimeEnabledFeatures.h
>index 420e59c014e19a9d3c084dba2112bd84630a08b4..c68d867c794078114da0766baf0caf00d8e38357 100644
>--- a/Source/WebCore/page/RuntimeEnabledFeatures.h
>+++ b/Source/WebCore/page/RuntimeEnabledFeatures.h
>@@ -151,9 +151,6 @@ public:
> 
>     void setIsITPDatabaseEnabled(bool isEnabled) { m_isITPDatabaseEnabled = isEnabled; }
>     bool isITPDatabaseEnabled() const { return m_isITPDatabaseEnabled; }
>-    
>-    void setIsITPFirstPartyWebsiteDataRemovalEnabled(bool isEnabled) { m_isITPFirstPartyWebsiteDataRemovalEnabled = isEnabled; }
>-    bool isITPFirstPartyWebsiteDataRemovalEnabled() const { return m_isITPFirstPartyWebsiteDataRemovalEnabled; }
> 
>     void setRestrictedHTTPResponseAccess(bool isEnabled) { m_isRestrictedHTTPResponseAccess = isEnabled; }
>     bool restrictedHTTPResponseAccess() const { return m_isRestrictedHTTPResponseAccess; }
>@@ -553,7 +550,6 @@ private:
> #endif
> 
>     bool m_isITPDatabaseEnabled { false };
>-    bool m_isITPFirstPartyWebsiteDataRemovalEnabled { false };
> 
>     bool m_referrerPolicyAttributeEnabled { false };
>     bool m_interruptAudioOnPageVisibilityChangeEnabled { false };
>diff --git a/Source/WebKit/NetworkProcess/Classifier/ResourceLoadStatisticsMemoryStore.cpp b/Source/WebKit/NetworkProcess/Classifier/ResourceLoadStatisticsMemoryStore.cpp
>index 82134fe76d70e3cf508209a191cce44e094b577e..35241748de43613ef03023b3e6576358b6efffc4 100644
>--- a/Source/WebKit/NetworkProcess/Classifier/ResourceLoadStatisticsMemoryStore.cpp
>+++ b/Source/WebKit/NetworkProcess/Classifier/ResourceLoadStatisticsMemoryStore.cpp
>@@ -41,7 +41,6 @@
> #include <WebCore/KeyedCoding.h>
> #include <WebCore/NetworkStorageSession.h>
> #include <WebCore/ResourceLoadStatistics.h>
>-#include <WebCore/RuntimeEnabledFeatures.h>
> #include <WebCore/UserGestureIndicator.h>
> #include <wtf/CallbackAggregator.h>
> #include <wtf/DateMath.h>
>@@ -797,7 +796,7 @@ bool ResourceLoadStatisticsMemoryStore::shouldRemoveAllWebsiteDataFor(ResourceLo
> 
> bool ResourceLoadStatisticsMemoryStore::shouldRemoveAllButCookiesFor(ResourceLoadStatistics& resourceStatistic, bool shouldCheckForGrandfathering) const
> {
>-    return RuntimeEnabledFeatures::sharedFeatures().isITPFirstPartyWebsiteDataRemovalEnabled() && resourceStatistic.gotLinkDecorationFromPrevalentResource && !hasHadUnexpiredRecentUserInteraction(resourceStatistic, OperatingDatesWindow::Short) && (!shouldCheckForGrandfathering || !resourceStatistic.grandfathered);
>+    return resourceStatistic.gotLinkDecorationFromPrevalentResource && !hasHadUnexpiredRecentUserInteraction(resourceStatistic, OperatingDatesWindow::Short) && (!shouldCheckForGrandfathering || !resourceStatistic.grandfathered);
> }
> 
> HashMap<RegistrableDomain, WebsiteDataToRemove> ResourceLoadStatisticsMemoryStore::registrableDomainsToRemoveWebsiteDataFor()
>diff --git a/Source/WebKit/NetworkProcess/NetworkProcess.cpp b/Source/WebKit/NetworkProcess/NetworkProcess.cpp
>index e2ed15e25ef6e42dd4828906188aee0ad77594fb..afaa4ebd16e209c143f8e53ae372ed86daaa2ae3 100644
>--- a/Source/WebKit/NetworkProcess/NetworkProcess.cpp
>+++ b/Source/WebKit/NetworkProcess/NetworkProcess.cpp
>@@ -309,7 +309,6 @@ void NetworkProcess::initializeNetworkProcess(NetworkProcessCreationParameters&&
>         switchToNewTestingSession();
> 
>     WebCore::RuntimeEnabledFeatures::sharedFeatures().setIsITPDatabaseEnabled(parameters.shouldEnableITPDatabase);
>-    WebCore::RuntimeEnabledFeatures::sharedFeatures().setIsITPFirstPartyWebsiteDataRemovalEnabled(parameters.isITPFirstPartyWebsiteDataRemovalEnabled);
> 
>     WebCore::RuntimeEnabledFeatures::sharedFeatures().setAdClickAttributionDebugModeEnabled(parameters.enableAdClickAttributionDebugMode);
> 
>diff --git a/Source/WebKit/NetworkProcess/NetworkProcessCreationParameters.cpp b/Source/WebKit/NetworkProcess/NetworkProcessCreationParameters.cpp
>index dc34806a9b2a0442ce33113728ac35e55ee12e92..d285147af6300afe97c3edce391d33c3c141274c 100644
>--- a/Source/WebKit/NetworkProcess/NetworkProcessCreationParameters.cpp
>+++ b/Source/WebKit/NetworkProcess/NetworkProcessCreationParameters.cpp
>@@ -90,7 +90,6 @@ void NetworkProcessCreationParameters::encode(IPC::Encoder& encoder) const
> #endif
>     encoder << shouldEnableITPDatabase;
>     encoder << downloadMonitorSpeedMultiplier;
>-    encoder << isITPFirstPartyWebsiteDataRemovalEnabled;
>     encoder << enableAdClickAttributionDebugMode;
>     encoder << hstsStorageDirectory;
>     encoder << hstsStorageDirectoryExtensionHandle;
>@@ -220,9 +219,6 @@ bool NetworkProcessCreationParameters::decode(IPC::Decoder& decoder, NetworkProc
>         return false;
>     result.downloadMonitorSpeedMultiplier = *downloadMonitorSpeedMultiplier;
> 
>-    if (!decoder.decode(result.isITPFirstPartyWebsiteDataRemovalEnabled))
>-        return false;
>-
>     if (!decoder.decode(result.enableAdClickAttributionDebugMode))
>         return false;
> 
>diff --git a/Source/WebKit/NetworkProcess/NetworkProcessCreationParameters.h b/Source/WebKit/NetworkProcess/NetworkProcessCreationParameters.h
>index 9cdc45a1b2953000de7d9a06b7315fb65b2791fd..1777faeac912028a15eebbd2117f7a3e72a49b95 100644
>--- a/Source/WebKit/NetworkProcess/NetworkProcessCreationParameters.h
>+++ b/Source/WebKit/NetworkProcess/NetworkProcessCreationParameters.h
>@@ -107,7 +107,6 @@ struct NetworkProcessCreationParameters {
>     bool shouldDisableServiceWorkerProcessTerminationDelay { false };
> #endif
>     bool shouldEnableITPDatabase { false };
>-    bool isITPFirstPartyWebsiteDataRemovalEnabled { true };
>     uint32_t downloadMonitorSpeedMultiplier { 1 };
>     bool enableAdClickAttributionDebugMode { false };
>     String hstsStorageDirectory;
>diff --git a/Source/WebKit/Shared/WebPreferences.yaml b/Source/WebKit/Shared/WebPreferences.yaml
>index b94658b1063556b2b0235d060ba12dd31123d780..f07e50e16956592d21066db69f78696f1d55a593 100644
>--- a/Source/WebKit/Shared/WebPreferences.yaml
>+++ b/Source/WebKit/Shared/WebPreferences.yaml
>@@ -1393,14 +1393,6 @@ MediaCapabilitiesExtensionsEnabled:
>   humanReadableDescription: "Media Capabilities Extensions"
>   category: experimental
> 
>-IsITPFirstPartyWebsiteDataRemovalEnabled:
>-    type: bool
>-    defaultValue: true
>-    humanReadableName: "ITP First Party Website Data Removal"
>-    humanReadableDescription: "Enable Intelligent Tracking Prevention First Party Website Data Removal"
>-    webcoreBinding: RuntimeEnabledFeatures
>-    category: experimental
>-
> ResizeObserverEnabled:
>   type: bool
>   defaultValue: false
>diff --git a/Source/WebKit/UIProcess/Cocoa/WebProcessPoolCocoa.mm b/Source/WebKit/UIProcess/Cocoa/WebProcessPoolCocoa.mm
>index 807632ff57c963eedf50bcbb59c23c27d1af386b..ea6a1e87fa93420cac2aa00e51aa5f2f38a2d594 100644
>--- a/Source/WebKit/UIProcess/Cocoa/WebProcessPoolCocoa.mm
>+++ b/Source/WebKit/UIProcess/Cocoa/WebProcessPoolCocoa.mm
>@@ -299,12 +299,6 @@ void WebProcessPool::platformInitializeNetworkProcess(NetworkProcessCreationPara
>     parameters.shouldEnableITPDatabase = [defaults boolForKey:[NSString stringWithFormat:@"InternalDebug%@", WebPreferencesKey::isITPDatabaseEnabledKey().createCFString().get()]];
>     parameters.downloadMonitorSpeedMultiplier = m_configuration->downloadMonitorSpeedMultiplier();
> 
>-    // Check if the feature has been turned off explicitly. This avoids interpreting
>-    // a non-existing default as a false value.
>-    auto isITPFirstPartyWebsiteDataRemovalEnabledStr = [defaults stringForKey:[NSString stringWithFormat:@"Experimental%@", WebPreferencesKey::isITPFirstPartyWebsiteDataRemovalEnabledKey().createCFString().get()]];
>-    if ([isITPFirstPartyWebsiteDataRemovalEnabledStr isEqual:@"0"])
>-        parameters.isITPFirstPartyWebsiteDataRemovalEnabled = false;
>-
>     parameters.enableAdClickAttributionDebugMode = [defaults boolForKey:[NSString stringWithFormat:@"Experimental%@", WebPreferencesKey::adClickAttributionDebugModeEnabledKey().createCFString().get()]];
> }
>

Actions: View | Formatted Diff | Diff

Attachments on bug 199164: 372772