Diff
Modified: branches/safari-609-branch/Source/WebCore/ChangeLog (254600 => 254601)
--- branches/safari-609-branch/Source/WebCore/ChangeLog 2020-01-15 19:15:15 UTC (rev 254600)
+++ branches/safari-609-branch/Source/WebCore/ChangeLog 2020-01-15 19:15:19 UTC (rev 254601)
@@ -1,5 +1,57 @@
2020-01-14 Alan Coon <alanc...@apple.com>
+ Cherry-pick r254239. rdar://problem/58549100
+
+ Resource Load Statistics: Flip experimental cookie blocking setting from an enable to a disable
+ https://bugs.webkit.org/show_bug.cgi?id=205963
+ <rdar://problem/58424136>
+
+ 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
+ cookie blocking 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):
+
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@254239 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2020-01-08 John Wilander <wilan...@apple.com>
+
+ Resource Load Statistics: Flip experimental cookie blocking setting from an enable to a disable
+ https://bugs.webkit.org/show_bug.cgi?id=205963
+ <rdar://problem/58424136>
+
+ 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
+ cookie blocking flag.
+
+ No new tests. This change just reverses the interpretation of a flag.
+
+ * page/Settings.yaml:
+
+2020-01-14 Alan Coon <alanc...@apple.com>
+
Cherry-pick r254201. rdar://problem/58552859
[Web Animations] Stop creating CSS Animations for <noscript> elements
Modified: branches/safari-609-branch/Source/WebCore/page/Settings.yaml (254600 => 254601)
--- branches/safari-609-branch/Source/WebCore/page/Settings.yaml 2020-01-15 19:15:15 UTC (rev 254600)
+++ branches/safari-609-branch/Source/WebCore/page/Settings.yaml 2020-01-15 19:15:19 UTC (rev 254601)
@@ -886,8 +886,8 @@
initial: true
inspectorOverride: true
-isThirdPartyCookieBlockingEnabled:
- initial: true
+isThirdPartyCookieBlockingDisabled:
+ initial: false
isFirstPartyWebsiteDataRemovalEnabled:
initial: true
Modified: branches/safari-609-branch/Source/WebKit/ChangeLog (254600 => 254601)
--- branches/safari-609-branch/Source/WebKit/ChangeLog 2020-01-15 19:15:15 UTC (rev 254600)
+++ branches/safari-609-branch/Source/WebKit/ChangeLog 2020-01-15 19:15:19 UTC (rev 254601)
@@ -1,5 +1,64 @@
2020-01-14 Alan Coon <alanc...@apple.com>
+ Cherry-pick r254239. rdar://problem/58549100
+
+ Resource Load Statistics: Flip experimental cookie blocking setting from an enable to a disable
+ https://bugs.webkit.org/show_bug.cgi?id=205963
+ <rdar://problem/58424136>
+
+ 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
+ cookie blocking 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):
+
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@254239 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2020-01-08 John Wilander <wilan...@apple.com>
+
+ Resource Load Statistics: Flip experimental cookie blocking setting from an enable to a disable
+ https://bugs.webkit.org/show_bug.cgi?id=205963
+ <rdar://problem/58424136>
+
+ 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
+ cookie blocking 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-14 Alan Coon <alanc...@apple.com>
+
Cherry-pick r254208. rdar://problem/58559193
IPC::Connection::sendMessage() should use CRASH_WITH_INFO()
Modified: branches/safari-609-branch/Source/WebKit/NetworkProcess/Classifier/ResourceLoadStatisticsStore.h (254600 => 254601)
--- branches/safari-609-branch/Source/WebKit/NetworkProcess/Classifier/ResourceLoadStatisticsStore.h 2020-01-15 19:15:15 UTC (rev 254600)
+++ branches/safari-609-branch/Source/WebKit/NetworkProcess/Classifier/ResourceLoadStatisticsStore.h 2020-01-15 19:15:19 UTC (rev 254601)
@@ -274,7 +274,7 @@
const RegistrableDomain m_debugStaticPrevalentResource { URL { URL(), "https://3rdpartytestwebkit.org"_s } };
bool m_debugLoggingEnabled { false };
bool m_debugModeEnabled { false };
- WebCore::ThirdPartyCookieBlockingMode m_thirdPartyCookieBlockingMode { WebCore::ThirdPartyCookieBlockingMode::AllOnSitesWithoutUserInteraction };
+ WebCore::ThirdPartyCookieBlockingMode m_thirdPartyCookieBlockingMode { WebCore::ThirdPartyCookieBlockingMode::All };
bool m_dataRecordsBeingRemoved { false };
ShouldIncludeLocalhost m_shouldIncludeLocalhost { ShouldIncludeLocalhost::Yes };
WebCore::FirstPartyWebsiteDataRemovalMode m_firstPartyWebsiteDataRemovalMode { WebCore::FirstPartyWebsiteDataRemovalMode::None };
Modified: branches/safari-609-branch/Source/WebKit/NetworkProcess/NetworkSession.h (254600 => 254601)
--- branches/safari-609-branch/Source/WebKit/NetworkProcess/NetworkSession.h 2020-01-15 19:15:15 UTC (rev 254600)
+++ branches/safari-609-branch/Source/WebKit/NetworkProcess/NetworkSession.h 2020-01-15 19:15:19 UTC (rev 254601)
@@ -153,7 +153,7 @@
WebCore::RegistrableDomain m_resourceLoadStatisticsManualPrevalentResource;
bool m_enableResourceLoadStatisticsLogTestingEvent;
bool m_downgradeReferrer { true };
- WebCore::ThirdPartyCookieBlockingMode m_thirdPartyCookieBlockingMode { WebCore::ThirdPartyCookieBlockingMode::AllOnSitesWithoutUserInteraction };
+ WebCore::ThirdPartyCookieBlockingMode m_thirdPartyCookieBlockingMode { WebCore::ThirdPartyCookieBlockingMode::All };
WebCore::FirstPartyWebsiteDataRemovalMode m_firstPartyWebsiteDataRemovalMode { WebCore::FirstPartyWebsiteDataRemovalMode::None };
#endif
bool m_isStaleWhileRevalidateEnabled { false };
Modified: branches/safari-609-branch/Source/WebKit/NetworkProcess/NetworkSessionCreationParameters.h (254600 => 254601)
--- branches/safari-609-branch/Source/WebKit/NetworkProcess/NetworkSessionCreationParameters.h 2020-01-15 19:15:15 UTC (rev 254600)
+++ branches/safari-609-branch/Source/WebKit/NetworkProcess/NetworkSessionCreationParameters.h 2020-01-15 19:15:19 UTC (rev 254601)
@@ -86,7 +86,7 @@
bool enableResourceLoadStatisticsLogTestingEvent { false };
bool shouldIncludeLocalhostInResourceLoadStatistics { true };
bool enableResourceLoadStatisticsDebugMode { false };
- WebCore::ThirdPartyCookieBlockingMode thirdPartyCookieBlockingMode { WebCore::ThirdPartyCookieBlockingMode::AllOnSitesWithoutUserInteraction };
+ WebCore::ThirdPartyCookieBlockingMode thirdPartyCookieBlockingMode { WebCore::ThirdPartyCookieBlockingMode::All };
WebCore::FirstPartyWebsiteDataRemovalMode firstPartyWebsiteDataRemovalMode { WebCore::FirstPartyWebsiteDataRemovalMode::None };
bool deviceManagementRestrictionsEnabled { false };
bool allLoadsBlockedByDeviceManagementRestrictionsForTesting { false };
Modified: branches/safari-609-branch/Source/WebKit/Shared/WebPreferences.yaml (254600 => 254601)
--- branches/safari-609-branch/Source/WebKit/Shared/WebPreferences.yaml 2020-01-15 19:15:15 UTC (rev 254600)
+++ branches/safari-609-branch/Source/WebKit/Shared/WebPreferences.yaml 2020-01-15 19:15:19 UTC (rev 254601)
@@ -1822,11 +1822,11 @@
webcoreBinding: RuntimeEnabledFeatures
category: experimental
-IsThirdPartyCookieBlockingEnabled:
+IsThirdPartyCookieBlockingDisabled:
type: bool
- defaultValue: true
- humanReadableName: "Block All 3rd-Party Cookies (ITP)"
- humanReadableDescription: "Block all third-party cookies when Intelligent Tracking Prevention is enabled"
+ defaultValue: false
+ humanReadableName: "Disable Full 3rd-Party Cookie Blocking (ITP)"
+ humanReadableDescription: "Disable full third-party cookie blocking when Intelligent Tracking Prevention is enabled"
category: experimental
IsFirstPartyWebsiteDataRemovalEnabled:
Modified: branches/safari-609-branch/Source/WebKit/UIProcess/WebProcessPool.cpp (254600 => 254601)
--- branches/safari-609-branch/Source/WebKit/UIProcess/WebProcessPool.cpp 2020-01-15 19:15:15 UTC (rev 254600)
+++ branches/safari-609-branch/Source/WebKit/UIProcess/WebProcessPool.cpp 2020-01-15 19:15:19 UTC (rev 254601)
@@ -576,7 +576,7 @@
bool enableResourceLoadStatisticsLogTestingEvent = false;
bool shouldIncludeLocalhost = true;
bool enableResourceLoadStatisticsDebugMode = false;
- WebCore::ThirdPartyCookieBlockingMode thirdPartyCookieBlockingMode = WebCore::ThirdPartyCookieBlockingMode::AllOnSitesWithoutUserInteraction;
+ WebCore::ThirdPartyCookieBlockingMode thirdPartyCookieBlockingMode = WebCore::ThirdPartyCookieBlockingMode::All;
WebCore::FirstPartyWebsiteDataRemovalMode firstPartyWebsiteDataRemovalMode = WebCore::FirstPartyWebsiteDataRemovalMode::None;
WebCore::RegistrableDomain manualPrevalentResource { };
if (withWebsiteDataStore) {
Modified: branches/safari-609-branch/Source/WebKit/UIProcess/WebsiteData/Cocoa/WebsiteDataStoreCocoa.mm (254600 => 254601)
--- branches/safari-609-branch/Source/WebKit/UIProcess/WebsiteData/Cocoa/WebsiteDataStoreCocoa.mm 2020-01-15 19:15:15 UTC (rev 254600)
+++ branches/safari-609-branch/Source/WebKit/UIProcess/WebsiteData/Cocoa/WebsiteDataStoreCocoa.mm 2020-01-15 19:15:19 UTC (rev 254601)
@@ -72,7 +72,7 @@
NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
bool shouldLogCookieInformation = false;
bool enableResourceLoadStatisticsDebugMode = false;
- auto thirdPartyCookieBlockingMode = WebCore::ThirdPartyCookieBlockingMode::OnlyAccordingToPerDomainPolicy;
+ auto thirdPartyCookieBlockingMode = WebCore::ThirdPartyCookieBlockingMode::All;
auto firstPartyWebsiteDataRemovalMode = WebCore::FirstPartyWebsiteDataRemovalMode::None;
bool enableLegacyTLS = false;
if (id value = [defaults objectForKey:@"WebKitEnableLegacyTLS"])
@@ -87,10 +87,10 @@
WebCore::RegistrableDomain resourceLoadStatisticsManualPrevalentResource { };
#if ENABLE(RESOURCE_LOAD_STATISTICS)
enableResourceLoadStatisticsDebugMode = [defaults boolForKey:@"ITPDebugMode"];
- if ([defaults boolForKey:[NSString stringWithFormat:@"Experimental%@", WebPreferencesKey::isThirdPartyCookieBlockingEnabledKey().createCFString().get()]])
+ if ([defaults boolForKey:[NSString stringWithFormat:@"Experimental%@", WebPreferencesKey::isThirdPartyCookieBlockingDisabledKey().createCFString().get()]])
+ thirdPartyCookieBlockingMode = WebCore::ThirdPartyCookieBlockingMode::AllOnSitesWithoutUserInteraction;
+ else
thirdPartyCookieBlockingMode = WebCore::ThirdPartyCookieBlockingMode::All;
- else
- thirdPartyCookieBlockingMode = WebCore::ThirdPartyCookieBlockingMode::AllOnSitesWithoutUserInteraction;
if ([defaults boolForKey:[NSString stringWithFormat:@"Experimental%@", WebPreferencesKey::isFirstPartyWebsiteDataRemovalEnabledKey().createCFString().get()]]) {
if ([defaults boolForKey:[NSString stringWithFormat:@"InternalDebug%@", WebPreferencesKey::isFirstPartyWebsiteDataRemovalReproTestingEnabledKey().createCFString().get()]])
firstPartyWebsiteDataRemovalMode = WebCore::FirstPartyWebsiteDataRemovalMode::AllButCookiesReproTestingTimeout;
