Diff
Modified: trunk/Source/WebKit/ChangeLog (259692 => 259693)
--- trunk/Source/WebKit/ChangeLog 2020-04-08 00:32:39 UTC (rev 259692)
+++ trunk/Source/WebKit/ChangeLog 2020-04-08 00:34:20 UTC (rev 259693)
@@ -1,3 +1,23 @@
+2020-04-07 John Wilander <wilan...@apple.com>
+
+ ITP Debug Mode logs should be more generic now that it blocks all third-party cookies by default
+ https://bugs.webkit.org/show_bug.cgi?id=210133
+ <rdar://problem/61399686>
+
+ Reviewed by Brent Fulgham.
+
+ No new tests. Just a change of logging.
+
+ * NetworkProcess/Classifier/ResourceLoadStatisticsDatabaseStore.cpp:
+ (WebKit::ResourceLoadStatisticsMemoryStore::updateCookieBlocking):
+ Now logs if either vector has entries and uses more generic language.
+ * NetworkProcess/Classifier/ResourceLoadStatisticsMemoryStore.cpp:
+ (WebKit::ResourceLoadStatisticsMemoryStore::updateCookieBlocking):
+ Now logs if either vector has entries and uses more generic language.
+ * NetworkProcess/Classifier/ResourceLoadStatisticsStore.cpp:
+ (WebKit::ResourceLoadStatisticsStore::debugLogDomainsInBatches):
+ Removed hard-coded references to third-party cookie blocking and parameterized it instead.
+
2020-04-07 Joonghun Park <jh718.p...@samsung.com>
Move the misplaced statement to the proper place where in
Modified: trunk/Source/WebKit/NetworkProcess/Classifier/ResourceLoadStatisticsDatabaseStore.cpp (259692 => 259693)
--- trunk/Source/WebKit/NetworkProcess/Classifier/ResourceLoadStatisticsDatabaseStore.cpp 2020-04-08 00:32:39 UTC (rev 259692)
+++ trunk/Source/WebKit/NetworkProcess/Classifier/ResourceLoadStatisticsDatabaseStore.cpp 2020-04-08 00:34:20 UTC (rev 259693)
@@ -2272,8 +2272,8 @@
RegistrableDomainsToBlockCookiesFor domainsToBlock { domainsToBlockAndDeleteCookiesFor, domainsToBlockButKeepCookiesFor, domainsWithUserInteractionAsFirstParty };
- if (debugLoggingEnabled() && !domainsToBlockAndDeleteCookiesFor.isEmpty() && !domainsToBlockButKeepCookiesFor.isEmpty())
- debugLogDomainsInBatches("block", domainsToBlock);
+ if (debugLoggingEnabled() && (!domainsToBlockAndDeleteCookiesFor.isEmpty() || !domainsToBlockButKeepCookiesFor.isEmpty()))
+ debugLogDomainsInBatches("Applying cross-site tracking restrictions", domainsToBlock);
RunLoop::main().dispatch([weakThis = makeWeakPtr(*this), store = makeRef(store()), domainsToBlock = crossThreadCopy(domainsToBlock), completionHandler = WTFMove(completionHandler)] () mutable {
store->callUpdatePrevalentDomainsToBlockCookiesForHandler(domainsToBlock, [weakThis = WTFMove(weakThis), store = store.copyRef(), completionHandler = WTFMove(completionHandler)]() mutable {
@@ -2284,8 +2284,8 @@
return;
if (UNLIKELY(weakThis->debugLoggingEnabled())) {
- RELEASE_LOG_INFO(ITPDebug, "Done updating cookie blocking.");
- weakThis->debugBroadcastConsoleMessage(MessageSource::ITPDebug, MessageLevel::Info, "[ITP] Done updating cookie blocking."_s);
+ RELEASE_LOG_INFO(ITPDebug, "Done applying cross-site tracking restrictions.");
+ weakThis->debugBroadcastConsoleMessage(MessageSource::ITPDebug, MessageLevel::Info, "[ITP] Done applying cross-site tracking restrictions."_s);
}
});
});
Modified: trunk/Source/WebKit/NetworkProcess/Classifier/ResourceLoadStatisticsMemoryStore.cpp (259692 => 259693)
--- trunk/Source/WebKit/NetworkProcess/Classifier/ResourceLoadStatisticsMemoryStore.cpp 2020-04-08 00:32:39 UTC (rev 259692)
+++ trunk/Source/WebKit/NetworkProcess/Classifier/ResourceLoadStatisticsMemoryStore.cpp 2020-04-08 00:34:20 UTC (rev 259693)
@@ -872,8 +872,8 @@
RegistrableDomainsToBlockCookiesFor domainsToBlock { domainsToBlockAndDeleteCookiesFor, domainsToBlockButKeepCookiesFor, domainsWithUserInteractionAsFirstParty };
- if (debugLoggingEnabled() && !domainsToBlockAndDeleteCookiesFor.isEmpty() && !domainsToBlockButKeepCookiesFor.isEmpty())
- debugLogDomainsInBatches("block", domainsToBlock);
+ if (debugLoggingEnabled() && (!domainsToBlockAndDeleteCookiesFor.isEmpty() || !domainsToBlockButKeepCookiesFor.isEmpty()))
+ debugLogDomainsInBatches("Applying cross-site tracking restrictions", domainsToBlock);
RunLoop::main().dispatch([weakThis = makeWeakPtr(*this), store = makeRef(store()), domainsToBlock = crossThreadCopy(domainsToBlock), completionHandler = WTFMove(completionHandler)] () mutable {
store->callUpdatePrevalentDomainsToBlockCookiesForHandler(domainsToBlock, [weakThis = WTFMove(weakThis), store = store.copyRef(), completionHandler = WTFMove(completionHandler)]() mutable {
@@ -884,8 +884,8 @@
return;
if (UNLIKELY(weakThis->debugLoggingEnabled())) {
- RELEASE_LOG_INFO(ITPDebug, "Done updating cookie blocking.");
- weakThis->debugBroadcastConsoleMessage(MessageSource::ITPDebug, MessageLevel::Info, "[ITP] Done updating cookie blocking."_s);
+ RELEASE_LOG_INFO(ITPDebug, "Done applying cross-site tracking restrictions.");
+ weakThis->debugBroadcastConsoleMessage(MessageSource::ITPDebug, MessageLevel::Info, "[ITP] Done applying cross-site tracking restrictions."_s);
}
});
});
Modified: trunk/Source/WebKit/NetworkProcess/Classifier/ResourceLoadStatisticsStore.cpp (259692 => 259693)
--- trunk/Source/WebKit/NetworkProcess/Classifier/ResourceLoadStatisticsStore.cpp 2020-04-08 00:32:39 UTC (rev 259692)
+++ trunk/Source/WebKit/NetworkProcess/Classifier/ResourceLoadStatisticsStore.cpp 2020-04-08 00:34:20 UTC (rev 259693)
@@ -604,6 +604,8 @@
void ResourceLoadStatisticsStore::debugLogDomainsInBatches(const char* action, const RegistrableDomainsToBlockCookiesFor& domainsToBlock)
{
+ ASSERT(debugLoggingEnabled());
+
Vector<RegistrableDomain> domains;
domains.appendVector(domainsToBlock.domainsToBlockAndDeleteCookiesFor);
domains.appendVector(domainsToBlock.domainsToBlockButKeepCookiesFor);
@@ -610,12 +612,12 @@
if (domains.isEmpty())
return;
- debugBroadcastConsoleMessage(MessageSource::ITPDebug, MessageLevel::Info, makeString("[ITP] About to "_s, action, "cookies in third-party contexts for: ["_s, domainsToString(domains), "]."_s));
+ debugBroadcastConsoleMessage(MessageSource::ITPDebug, MessageLevel::Info, makeString("[ITP] "_s, action, " to: ["_s, domainsToString(domains), "]."_s));
static const auto maxNumberOfDomainsInOneLogStatement = 50;
if (domains.size() <= maxNumberOfDomainsInOneLogStatement) {
- RELEASE_LOG_INFO(ITPDebug, "About to %" PUBLIC_LOG_STRING " cookies in third-party contexts for: %" PUBLIC_LOG_STRING ".", action, domainsToString(domains).utf8().data());
+ RELEASE_LOG_INFO(ITPDebug, "%" PUBLIC_LOG_STRING " to: %" PUBLIC_LOG_STRING ".", action, domainsToString(domains).utf8().data());
return;
}
@@ -626,7 +628,7 @@
for (auto& domain : domains) {
if (batch.size() == maxNumberOfDomainsInOneLogStatement) {
- RELEASE_LOG_INFO(ITPDebug, "About to %" PUBLIC_LOG_STRING " cookies in third-party contexts for (%{public}d of %u): %" PUBLIC_LOG_STRING ".", action, batchNumber, numberOfBatches, domainsToString(batch).utf8().data());
+ RELEASE_LOG_INFO(ITPDebug, "%" PUBLIC_LOG_STRING " to (%{public}d of %u): %" PUBLIC_LOG_STRING ".", action, batchNumber, numberOfBatches, domainsToString(batch).utf8().data());
batch.shrink(0);
++batchNumber;
}
@@ -633,7 +635,7 @@
batch.append(domain);
}
if (!batch.isEmpty())
- RELEASE_LOG_INFO(ITPDebug, "About to %" PUBLIC_LOG_STRING " cookies in third-party contexts for (%{public}d of %u): %" PUBLIC_LOG_STRING ".", action, batchNumber, numberOfBatches, domainsToString(batch).utf8().data());
+ RELEASE_LOG_INFO(ITPDebug, "%" PUBLIC_LOG_STRING " to (%{public}d of %u): %" PUBLIC_LOG_STRING ".", action, batchNumber, numberOfBatches, domainsToString(batch).utf8().data());
}
} // namespace WebKit
