Changeset 254293 in webkit

Timestamp:

Jan 9, 2020, 1:32:04 PM (7 years ago)

Author:

wilander@apple.com

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):

Location:

trunk/Source

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/page/Settings.yaml (modified) (1 diff)
• WebKit/ChangeLog (modified) (1 diff)
• WebKit/NetworkProcess/Classifier/ResourceLoadStatisticsStore.h (modified) (1 diff)
• WebKit/NetworkProcess/NetworkSession.h (modified) (1 diff)
• WebKit/NetworkProcess/NetworkSessionCreationParameters.h (modified) (1 diff)
• WebKit/Shared/WebPreferences.yaml (modified) (1 diff)
• WebKit/UIProcess/WebProcessPool.cpp (modified) (1 diff)
• WebKit/UIProcess/WebsiteData/Cocoa/WebsiteDataStoreCocoa.mm (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2020-01-09  John Wilander  <wilander@apple.com>
+
+        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  <clord@igalia.com>
 

trunk/Source/WebCore/page/Settings.yaml

@@ -890 +890 @@
   initial: false
 
-isFirstPartyWebsiteDataRemovalEnabled:
-  initial: true
+isFirstPartyWebsiteDataRemovalDisabled:
+  initial: false
 
 isFirstPartyWebsiteDataRemovalLiveOnTestingEnabled:

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2020-01-09  John Wilander  <wilander@apple.com>
+
+        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  <megan_gardner@apple.com>
 

trunk/Source/WebKit/NetworkProcess/Classifier/ResourceLoadStatisticsStore.h

@@ -278 +278 @@
     bool m_dataRecordsBeingRemoved { false };
     ShouldIncludeLocalhost m_shouldIncludeLocalhost { ShouldIncludeLocalhost::Yes };
-    WebCore::FirstPartyWebsiteDataRemovalMode m_firstPartyWebsiteDataRemovalMode { WebCore::FirstPartyWebsiteDataRemovalMode::None };
+    WebCore::FirstPartyWebsiteDataRemovalMode m_firstPartyWebsiteDataRemovalMode { WebCore::FirstPartyWebsiteDataRemovalMode::AllButCookies };
 };
 

trunk/Source/WebKit/NetworkProcess/NetworkSession.h

@@ -155 +155 @@
     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 };

trunk/Source/WebKit/NetworkProcess/NetworkSessionCreationParameters.h

@@ -88 +88 @@
     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 };

trunk/Source/WebKit/Shared/WebPreferences.yaml

@@ -1839 +1839 @@
   category: experimental
 
-IsFirstPartyWebsiteDataRemovalEnabled:
-  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"
+IsFirstPartyWebsiteDataRemovalDisabled:
+  type: bool
+  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
 

trunk/Source/WebKit/UIProcess/WebProcessPool.cpp

@@ -578 +578 @@
     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) {

trunk/Source/WebKit/UIProcess/WebsiteData/Cocoa/WebsiteDataStoreCocoa.mm

@@ -74 +74 @@
     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"])
@@ -92 +92 @@
     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;