- Revision
- 254293
- Author
- [email protected]
- Date
- 2020-01-09 13:32:04 -0800 (Thu, 09 Jan 2020)
Log Message
Resource Load Statistics: Flip experimental website data removal setting from an enable to a disable
https://bugs.webkit.org/show_bug.cgi?id=205966
<rdar://problem/58425000>
Reviewed by Brent Fulgham.
To get default on behavior, experimental features in the network process need to be
turned from enable flags to disable flags. This patch does that for the experimental
website data removal flag.
Source/WebCore:
No new tests. This change just reverses the interpretation of a flag.
* page/Settings.yaml:
Source/WebKit:
This change also aligns the init values of the setting to match the default.
* NetworkProcess/Classifier/ResourceLoadStatisticsStore.h:
* NetworkProcess/NetworkSession.h:
* NetworkProcess/NetworkSessionCreationParameters.h:
* Shared/WebPreferences.yaml:
* UIProcess/WebProcessPool.cpp:
(WebKit::WebProcessPool::ensureNetworkProcess):
* UIProcess/WebsiteData/Cocoa/WebsiteDataStoreCocoa.mm:
(WebKit::WebsiteDataStore::parameters):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (254292 => 254293)
--- trunk/Source/WebCore/ChangeLog 2020-01-09 21:10:17 UTC (rev 254292)
+++ trunk/Source/WebCore/ChangeLog 2020-01-09 21:32:04 UTC (rev 254293)
@@ -1,3 +1,19 @@
+2020-01-09 John Wilander <[email protected]>
+
+ Resource Load Statistics: Flip experimental website data removal setting from an enable to a disable
+ https://bugs.webkit.org/show_bug.cgi?id=205966
+ <rdar://problem/58425000>
+
+ Reviewed by Brent Fulgham.
+
+ To get default on behavior, experimental features in the network process need to be
+ turned from enable flags to disable flags. This patch does that for the experimental
+ website data removal flag.
+
+ No new tests. This change just reverses the interpretation of a flag.
+
+ * page/Settings.yaml:
+
2020-01-09 Chris Lord <[email protected]>
ImageBitmap can't be created in workers in some cases due to main-thread assert in ImageSource
Modified: trunk/Source/WebCore/page/Settings.yaml (254292 => 254293)
--- trunk/Source/WebCore/page/Settings.yaml 2020-01-09 21:10:17 UTC (rev 254292)
+++ trunk/Source/WebCore/page/Settings.yaml 2020-01-09 21:32:04 UTC (rev 254293)
@@ -889,8 +889,8 @@
isThirdPartyCookieBlockingDisabled:
initial: false
-isFirstPartyWebsiteDataRemovalEnabled:
- initial: true
+isFirstPartyWebsiteDataRemovalDisabled:
+ initial: false
isFirstPartyWebsiteDataRemovalLiveOnTestingEnabled:
initial: false
Modified: trunk/Source/WebKit/ChangeLog (254292 => 254293)
--- trunk/Source/WebKit/ChangeLog 2020-01-09 21:10:17 UTC (rev 254292)
+++ trunk/Source/WebKit/ChangeLog 2020-01-09 21:32:04 UTC (rev 254293)
@@ -1,3 +1,26 @@
+2020-01-09 John Wilander <[email protected]>
+
+ Resource Load Statistics: Flip experimental website data removal setting from an enable to a disable
+ https://bugs.webkit.org/show_bug.cgi?id=205966
+ <rdar://problem/58425000>
+
+ Reviewed by Brent Fulgham.
+
+ To get default on behavior, experimental features in the network process need to be
+ turned from enable flags to disable flags. This patch does that for the experimental
+ website data removal flag.
+
+ This change also aligns the init values of the setting to match the default.
+
+ * NetworkProcess/Classifier/ResourceLoadStatisticsStore.h:
+ * NetworkProcess/NetworkSession.h:
+ * NetworkProcess/NetworkSessionCreationParameters.h:
+ * Shared/WebPreferences.yaml:
+ * UIProcess/WebProcessPool.cpp:
+ (WebKit::WebProcessPool::ensureNetworkProcess):
+ * UIProcess/WebsiteData/Cocoa/WebsiteDataStoreCocoa.mm:
+ (WebKit::WebsiteDataStore::parameters):
+
2020-01-09 Megan Gardner <[email protected]>
Set the title for images so it will be correctly displayed in UIContextMenus
Modified: trunk/Source/WebKit/NetworkProcess/Classifier/ResourceLoadStatisticsStore.h (254292 => 254293)
--- trunk/Source/WebKit/NetworkProcess/Classifier/ResourceLoadStatisticsStore.h 2020-01-09 21:10:17 UTC (rev 254292)
+++ trunk/Source/WebKit/NetworkProcess/Classifier/ResourceLoadStatisticsStore.h 2020-01-09 21:32:04 UTC (rev 254293)
@@ -277,7 +277,7 @@
WebCore::ThirdPartyCookieBlockingMode m_thirdPartyCookieBlockingMode { WebCore::ThirdPartyCookieBlockingMode::All };
bool m_dataRecordsBeingRemoved { false };
ShouldIncludeLocalhost m_shouldIncludeLocalhost { ShouldIncludeLocalhost::Yes };
- WebCore::FirstPartyWebsiteDataRemovalMode m_firstPartyWebsiteDataRemovalMode { WebCore::FirstPartyWebsiteDataRemovalMode::None };
+ WebCore::FirstPartyWebsiteDataRemovalMode m_firstPartyWebsiteDataRemovalMode { WebCore::FirstPartyWebsiteDataRemovalMode::AllButCookies };
};
} // namespace WebKit
Modified: trunk/Source/WebKit/NetworkProcess/NetworkSession.h (254292 => 254293)
--- trunk/Source/WebKit/NetworkProcess/NetworkSession.h 2020-01-09 21:10:17 UTC (rev 254292)
+++ trunk/Source/WebKit/NetworkProcess/NetworkSession.h 2020-01-09 21:32:04 UTC (rev 254293)
@@ -154,7 +154,7 @@
bool m_enableResourceLoadStatisticsLogTestingEvent;
bool m_downgradeReferrer { true };
WebCore::ThirdPartyCookieBlockingMode m_thirdPartyCookieBlockingMode { WebCore::ThirdPartyCookieBlockingMode::All };
- WebCore::FirstPartyWebsiteDataRemovalMode m_firstPartyWebsiteDataRemovalMode { WebCore::FirstPartyWebsiteDataRemovalMode::None };
+ WebCore::FirstPartyWebsiteDataRemovalMode m_firstPartyWebsiteDataRemovalMode { WebCore::FirstPartyWebsiteDataRemovalMode::AllButCookies };
#endif
bool m_isStaleWhileRevalidateEnabled { false };
UniqueRef<AdClickAttributionManager> m_adClickAttribution;
Modified: trunk/Source/WebKit/NetworkProcess/NetworkSessionCreationParameters.h (254292 => 254293)
--- trunk/Source/WebKit/NetworkProcess/NetworkSessionCreationParameters.h 2020-01-09 21:10:17 UTC (rev 254292)
+++ trunk/Source/WebKit/NetworkProcess/NetworkSessionCreationParameters.h 2020-01-09 21:32:04 UTC (rev 254293)
@@ -87,7 +87,7 @@
bool shouldIncludeLocalhostInResourceLoadStatistics { true };
bool enableResourceLoadStatisticsDebugMode { false };
WebCore::ThirdPartyCookieBlockingMode thirdPartyCookieBlockingMode { WebCore::ThirdPartyCookieBlockingMode::All };
- WebCore::FirstPartyWebsiteDataRemovalMode firstPartyWebsiteDataRemovalMode { WebCore::FirstPartyWebsiteDataRemovalMode::None };
+ WebCore::FirstPartyWebsiteDataRemovalMode firstPartyWebsiteDataRemovalMode { WebCore::FirstPartyWebsiteDataRemovalMode::AllButCookies };
bool deviceManagementRestrictionsEnabled { false };
bool allLoadsBlockedByDeviceManagementRestrictionsForTesting { false };
WebCore::RegistrableDomain resourceLoadStatisticsManualPrevalentResource { };
Modified: trunk/Source/WebKit/Shared/WebPreferences.yaml (254292 => 254293)
--- trunk/Source/WebKit/Shared/WebPreferences.yaml 2020-01-09 21:10:17 UTC (rev 254292)
+++ trunk/Source/WebKit/Shared/WebPreferences.yaml 2020-01-09 21:32:04 UTC (rev 254293)
@@ -1838,11 +1838,11 @@
humanReadableDescription: "Disable full third-party cookie blocking when Intelligent Tracking Prevention is enabled"
category: experimental
-IsFirstPartyWebsiteDataRemovalEnabled:
+IsFirstPartyWebsiteDataRemovalDisabled:
type: bool
- defaultValue: true
- humanReadableName: "Remove Non-Cookie Data After 7 Days of No User Interaction (ITP)"
- humanReadableDescription: "Remove all non-cookie website data after seven days of no user interaction when Intelligent Tracking Prevention is enabled"
+ defaultValue: false
+ humanReadableName: "Disable Removal of Non-Cookie Data After 7 Days of No User Interaction (ITP)"
+ humanReadableDescription: "Disable removal of all non-cookie website data after seven days of no user interaction when Intelligent Tracking Prevention is enabled"
category: experimental
IsFirstPartyWebsiteDataRemovalLiveOnTestingEnabled:
Modified: trunk/Source/WebKit/UIProcess/WebProcessPool.cpp (254292 => 254293)
--- trunk/Source/WebKit/UIProcess/WebProcessPool.cpp 2020-01-09 21:10:17 UTC (rev 254292)
+++ trunk/Source/WebKit/UIProcess/WebProcessPool.cpp 2020-01-09 21:32:04 UTC (rev 254293)
@@ -577,7 +577,7 @@
bool shouldIncludeLocalhost = true;
bool enableResourceLoadStatisticsDebugMode = false;
WebCore::ThirdPartyCookieBlockingMode thirdPartyCookieBlockingMode = WebCore::ThirdPartyCookieBlockingMode::All;
- WebCore::FirstPartyWebsiteDataRemovalMode firstPartyWebsiteDataRemovalMode = WebCore::FirstPartyWebsiteDataRemovalMode::None;
+ WebCore::FirstPartyWebsiteDataRemovalMode firstPartyWebsiteDataRemovalMode = WebCore::FirstPartyWebsiteDataRemovalMode::AllButCookies;
WebCore::RegistrableDomain manualPrevalentResource { };
if (withWebsiteDataStore) {
enableResourceLoadStatistics = withWebsiteDataStore->resourceLoadStatisticsEnabled();
Modified: trunk/Source/WebKit/UIProcess/WebsiteData/Cocoa/WebsiteDataStoreCocoa.mm (254292 => 254293)
--- trunk/Source/WebKit/UIProcess/WebsiteData/Cocoa/WebsiteDataStoreCocoa.mm 2020-01-09 21:10:17 UTC (rev 254292)
+++ trunk/Source/WebKit/UIProcess/WebsiteData/Cocoa/WebsiteDataStoreCocoa.mm 2020-01-09 21:32:04 UTC (rev 254293)
@@ -73,7 +73,7 @@
bool shouldLogCookieInformation = false;
bool enableResourceLoadStatisticsDebugMode = false;
auto thirdPartyCookieBlockingMode = WebCore::ThirdPartyCookieBlockingMode::All;
- auto firstPartyWebsiteDataRemovalMode = WebCore::FirstPartyWebsiteDataRemovalMode::None;
+ auto firstPartyWebsiteDataRemovalMode = WebCore::FirstPartyWebsiteDataRemovalMode::AllButCookies;
bool enableLegacyTLS = false;
if (id value = [defaults objectForKey:@"WebKitEnableLegacyTLS"])
enableLegacyTLS = [value boolValue];
@@ -91,7 +91,9 @@
thirdPartyCookieBlockingMode = WebCore::ThirdPartyCookieBlockingMode::AllOnSitesWithoutUserInteraction;
else
thirdPartyCookieBlockingMode = WebCore::ThirdPartyCookieBlockingMode::All;
- if ([defaults boolForKey:[NSString stringWithFormat:@"Experimental%@", WebPreferencesKey::isFirstPartyWebsiteDataRemovalEnabledKey().createCFString().get()]]) {
+ if ([defaults boolForKey:[NSString stringWithFormat:@"Experimental%@", WebPreferencesKey::isFirstPartyWebsiteDataRemovalDisabledKey().createCFString().get()]])
+ firstPartyWebsiteDataRemovalMode = WebCore::FirstPartyWebsiteDataRemovalMode::None;
+ else {
if ([defaults boolForKey:[NSString stringWithFormat:@"InternalDebug%@", WebPreferencesKey::isFirstPartyWebsiteDataRemovalReproTestingEnabledKey().createCFString().get()]])
firstPartyWebsiteDataRemovalMode = WebCore::FirstPartyWebsiteDataRemovalMode::AllButCookiesReproTestingTimeout;
else if ([defaults boolForKey:[NSString stringWithFormat:@"InternalDebug%@", WebPreferencesKey::isFirstPartyWebsiteDataRemovalLiveOnTestingEnabledKey().createCFString().get()]])
