Diff
Modified: trunk/Source/WebCore/ChangeLog (258447 => 258448)
--- trunk/Source/WebCore/ChangeLog 2020-03-13 23:33:33 UTC (rev 258447)
+++ trunk/Source/WebCore/ChangeLog 2020-03-13 23:35:40 UTC (rev 258448)
@@ -1,3 +1,19 @@
+2020-03-13 John Wilander <wilan...@apple.com>
+
+ Remove unused code related to removePrevalentDomains()
+ https://bugs.webkit.org/show_bug.cgi?id=209078
+ <rdar://problem/59681984>
+
+ Reviewed by Brent Fulgham.
+
+ The various removePrevalentDomains() functions and its IPC endpoint are unused and should be removed.
+
+ No new tests. Just dead code removal.
+
+ * platform/network/NetworkStorageSession.cpp:
+ (WebCore::NetworkStorageSession::removePrevalentDomains): Deleted.
+ * platform/network/NetworkStorageSession.h:
+
2020-03-13 Myles C. Maxfield <mmaxfi...@apple.com>
[Cocoa] Push applicationSDKVersion() down from WebCore into WTF
Modified: trunk/Source/WebCore/platform/network/NetworkStorageSession.cpp (258447 => 258448)
--- trunk/Source/WebCore/platform/network/NetworkStorageSession.cpp 2020-03-13 23:33:33 UTC (rev 258447)
+++ trunk/Source/WebCore/platform/network/NetworkStorageSession.cpp 2020-03-13 23:35:40 UTC (rev 258448)
@@ -168,14 +168,6 @@
m_registrableDomainsWithUserInteractionAsFirstParty.add(domains.begin(), domains.end());
}
-void NetworkStorageSession::removePrevalentDomains(const Vector<RegistrableDomain>& domains)
-{
- for (auto& domain : domains) {
- m_registrableDomainsToBlockAndDeleteCookiesFor.remove(domain);
- m_registrableDomainsToBlockButKeepCookiesFor.remove(domain);
- }
-}
-
bool NetworkStorageSession::hasStorageAccess(const RegistrableDomain& resourceDomain, const RegistrableDomain& firstPartyDomain, Optional<FrameIdentifier> frameID, PageIdentifier pageID) const
{
if (frameID) {
Modified: trunk/Source/WebCore/platform/network/NetworkStorageSession.h (258447 => 258448)
--- trunk/Source/WebCore/platform/network/NetworkStorageSession.h 2020-03-13 23:33:33 UTC (rev 258447)
+++ trunk/Source/WebCore/platform/network/NetworkStorageSession.h 2020-03-13 23:35:40 UTC (rev 258448)
@@ -182,7 +182,6 @@
WEBCORE_EXPORT void setPrevalentDomainsToBlockButKeepCookiesFor(const Vector<RegistrableDomain>&);
WEBCORE_EXPORT void setDomainsWithUserInteractionAsFirstParty(const Vector<RegistrableDomain>&);
WEBCORE_EXPORT void setAgeCapForClientSideCookies(Optional<Seconds>);
- WEBCORE_EXPORT void removePrevalentDomains(const Vector<RegistrableDomain>& domains);
WEBCORE_EXPORT bool hasStorageAccess(const RegistrableDomain& resourceDomain, const RegistrableDomain& firstPartyDomain, Optional<FrameIdentifier>, PageIdentifier) const;
WEBCORE_EXPORT Vector<String> getAllStorageAccessEntries() const;
WEBCORE_EXPORT void grantStorageAccess(const RegistrableDomain& resourceDomain, const RegistrableDomain& firstPartyDomain, Optional<FrameIdentifier>, PageIdentifier);
Modified: trunk/Source/WebKit/ChangeLog (258447 => 258448)
--- trunk/Source/WebKit/ChangeLog 2020-03-13 23:33:33 UTC (rev 258447)
+++ trunk/Source/WebKit/ChangeLog 2020-03-13 23:35:40 UTC (rev 258448)
@@ -1,3 +1,24 @@
+2020-03-13 John Wilander <wilan...@apple.com>
+
+ Remove unused code related to removePrevalentDomains()
+ https://bugs.webkit.org/show_bug.cgi?id=209078
+ <rdar://problem/59681984>
+
+ Reviewed by Brent Fulgham.
+
+ The various removePrevalentDomains() functions and its IPC endpoint are unused and should be removed.
+
+ * NetworkProcess/Classifier/ResourceLoadStatisticsStore.cpp:
+ (WebKit::ResourceLoadStatisticsStore::clearBlockingStateForDomains): Deleted.
+ * NetworkProcess/Classifier/WebResourceLoadStatisticsStore.cpp:
+ (WebKit::WebResourceLoadStatisticsStore::removePrevalentDomains): Deleted.
+ (WebKit::WebResourceLoadStatisticsStore::callRemoveDomainsHandler): Deleted.
+ * NetworkProcess/Classifier/WebResourceLoadStatisticsStore.h:
+ * NetworkProcess/NetworkProcess.cpp:
+ (WebKit::NetworkProcess::removePrevalentDomains): Deleted.
+ * NetworkProcess/NetworkProcess.h:
+ * NetworkProcess/NetworkProcess.messages.in:
+
2020-03-13 Myles C. Maxfield <mmaxfi...@apple.com>
[Cocoa] Push applicationSDKVersion() down from WebCore into WTF
Modified: trunk/Source/WebKit/NetworkProcess/Classifier/ResourceLoadStatisticsStore.cpp (258447 => 258448)
--- trunk/Source/WebKit/NetworkProcess/Classifier/ResourceLoadStatisticsStore.cpp 2020-03-13 23:33:33 UTC (rev 258447)
+++ trunk/Source/WebKit/NetworkProcess/Classifier/ResourceLoadStatisticsStore.cpp 2020-03-13 23:35:40 UTC (rev 258448)
@@ -434,22 +434,6 @@
}
-void ResourceLoadStatisticsStore::clearBlockingStateForDomains(const Vector<RegistrableDomain>& domains, CompletionHandler<void()>&& completionHandler)
-{
- ASSERT(!RunLoop::isMain());
-
- if (domains.isEmpty()) {
- completionHandler();
- return;
- }
-
- RunLoop::main().dispatch([store = makeRef(m_store), domains = crossThreadCopy(domains)] {
- store->callRemoveDomainsHandler(domains);
- });
-
- completionHandler();
-}
-
Optional<Seconds> ResourceLoadStatisticsStore::statisticsEpirationTime() const
{
ASSERT(!RunLoop::isMain());
Modified: trunk/Source/WebKit/NetworkProcess/Classifier/WebResourceLoadStatisticsStore.cpp (258447 => 258448)
--- trunk/Source/WebKit/NetworkProcess/Classifier/WebResourceLoadStatisticsStore.cpp 2020-03-13 23:33:33 UTC (rev 258447)
+++ trunk/Source/WebKit/NetworkProcess/Classifier/WebResourceLoadStatisticsStore.cpp 2020-03-13 23:35:40 UTC (rev 258448)
@@ -1177,23 +1177,6 @@
completionHandler();
}
-void WebResourceLoadStatisticsStore::removePrevalentDomains(const Vector<RegistrableDomain>& domains)
-{
- ASSERT(RunLoop::isMain());
- if (!m_networkSession)
- return;
-
- if (auto* storageSession = m_networkSession->networkStorageSession())
- storageSession->removePrevalentDomains(domains);
-}
-
-void WebResourceLoadStatisticsStore::callRemoveDomainsHandler(const Vector<RegistrableDomain>& domains)
-{
- ASSERT(RunLoop::isMain());
-
- removePrevalentDomains(domains);
-}
-
void WebResourceLoadStatisticsStore::setMaxStatisticsEntries(size_t maximumEntryCount, CompletionHandler<void()>&& completionHandler)
{
ASSERT(RunLoop::isMain());
Modified: trunk/Source/WebKit/NetworkProcess/Classifier/WebResourceLoadStatisticsStore.h (258447 => 258448)
--- trunk/Source/WebKit/NetworkProcess/Classifier/WebResourceLoadStatisticsStore.h 2020-03-13 23:33:33 UTC (rev 258447)
+++ trunk/Source/WebKit/NetworkProcess/Classifier/WebResourceLoadStatisticsStore.h 2020-03-13 23:35:40 UTC (rev 258448)
@@ -236,7 +236,6 @@
void clearPrevalentResource(const RegistrableDomain&, CompletionHandler<void()>&&);
void setGrandfathered(const RegistrableDomain&, bool, CompletionHandler<void()>&&);
void isGrandfathered(const RegistrableDomain&, CompletionHandler<void(bool)>&&);
- void removePrevalentDomains(const Vector<RegistrableDomain>&);
void setNotifyPagesWhenDataRecordsWereScanned(bool, CompletionHandler<void()>&&);
void setIsRunningTest(bool, CompletionHandler<void()>&&);
void setSubframeUnderTopFrameDomain(const SubFrameDomain&, const TopFrameDomain&, CompletionHandler<void()>&&);
@@ -247,7 +246,6 @@
void setTopFrameUniqueRedirectFrom(const TopFrameDomain&, const RedirectedFromDomain&, CompletionHandler<void()>&&);
void scheduleCookieBlockingUpdate(CompletionHandler<void()>&&);
void scheduleCookieBlockingUpdateForDomains(const Vector<RegistrableDomain>&, CompletionHandler<void()>&&);
- void scheduleClearBlockingStateForDomains(const Vector<RegistrableDomain>&, CompletionHandler<void()>&&);
void scheduleStatisticsAndDataRecordsProcessing(CompletionHandler<void()>&&);
void submitTelemetry(CompletionHandler<void()>&&);
void scheduleClearInMemoryAndPersistent(ShouldGrandfatherStatistics, CompletionHandler<void()>&&);
@@ -270,7 +268,6 @@
void callGrantStorageAccessHandler(const SubFrameDomain&, const TopFrameDomain&, Optional<WebCore::FrameIdentifier>, WebCore::PageIdentifier, CompletionHandler<void(StorageAccessWasGranted)>&&);
void removeAllStorageAccess(CompletionHandler<void()>&&);
void callUpdatePrevalentDomainsToBlockCookiesForHandler(const RegistrableDomainsToBlockCookiesFor&, CompletionHandler<void()>&&);
- void callRemoveDomainsHandler(const Vector<RegistrableDomain>&);
void callHasStorageAccessForFrameHandler(const SubFrameDomain&, const TopFrameDomain&, WebCore::FrameIdentifier, WebCore::PageIdentifier, CompletionHandler<void(bool)>&&);
void hasCookies(const RegistrableDomain&, CompletionHandler<void(bool)>&&);
Modified: trunk/Source/WebKit/NetworkProcess/NetworkProcess.cpp (258447 => 258448)
--- trunk/Source/WebKit/NetworkProcess/NetworkProcess.cpp 2020-03-13 23:33:33 UTC (rev 258447)
+++ trunk/Source/WebKit/NetworkProcess/NetworkProcess.cpp 2020-03-13 23:35:40 UTC (rev 258448)
@@ -1089,12 +1089,6 @@
completionHandler(false);
}
-void NetworkProcess::removePrevalentDomains(PAL::SessionID sessionID, const Vector<RegistrableDomain>& domains)
-{
- if (auto* networkStorageSession = storageSession(sessionID))
- networkStorageSession->removePrevalentDomains(domains);
-}
-
void NetworkProcess::setCacheMaxAgeCapForPrevalentResources(PAL::SessionID sessionID, Seconds seconds, CompletionHandler<void()>&& completionHandler)
{
if (auto* networkStorageSession = storageSession(sessionID))
Modified: trunk/Source/WebKit/NetworkProcess/NetworkProcess.h (258447 => 258448)
--- trunk/Source/WebKit/NetworkProcess/NetworkProcess.h 2020-03-13 23:33:33 UTC (rev 258447)
+++ trunk/Source/WebKit/NetworkProcess/NetworkProcess.h 2020-03-13 23:35:40 UTC (rev 258448)
@@ -229,7 +229,6 @@
void getAllStorageAccessEntries(PAL::SessionID, CompletionHandler<void(Vector<String> domains)>&&);
void logFrameNavigation(PAL::SessionID, const NavigatedToDomain&, const TopFrameDomain&, const NavigatedFromDomain&, bool isRedirect, bool isMainFrame, Seconds delayAfterMainFrameDocumentLoad, bool wasPotentiallyInitiatedByUser);
void logUserInteraction(PAL::SessionID, const TopFrameDomain&, CompletionHandler<void()>&&);
- void removePrevalentDomains(PAL::SessionID, const Vector<RegistrableDomain>&);
void resetCacheMaxAgeCapForPrevalentResources(PAL::SessionID, CompletionHandler<void()>&&);
void resetParametersToDefaultValues(PAL::SessionID, CompletionHandler<void()>&&);
void scheduleClearInMemoryAndPersistent(PAL::SessionID, Optional<WallTime> modifiedSince, ShouldGrandfatherStatistics, CompletionHandler<void()>&&);
Modified: trunk/Source/WebKit/NetworkProcess/NetworkProcess.messages.in (258447 => 258448)
--- trunk/Source/WebKit/NetworkProcess/NetworkProcess.messages.in 2020-03-13 23:33:33 UTC (rev 258447)
+++ trunk/Source/WebKit/NetworkProcess/NetworkProcess.messages.in 2020-03-13 23:35:40 UTC (rev 258448)
@@ -107,7 +107,6 @@
IsRegisteredAsSubresourceUnder(PAL::SessionID sessionID, WebCore::RegistrableDomain subresourceDomain, WebCore::RegistrableDomain topFrameDomain) -> (bool isSubresourceUnder) Async
LogFrameNavigation(PAL::SessionID sessionID, WebCore::RegistrableDomain targetDomain, WebCore::RegistrableDomain topFrameDomain, WebCore::RegistrableDomain sourceDomain, bool isRedirect, bool isMainFrame, Seconds delayAfterMainFrameDocumentLoad, bool wasPotentiallyInitiatedByUser)
LogUserInteraction(PAL::SessionID sessionID, WebCore::RegistrableDomain topFrameDomain) -> () Async
- RemovePrevalentDomains(PAL::SessionID sessionID, Vector<WebCore::RegistrableDomain> domainsWithInteraction)
ResetParametersToDefaultValues(PAL::SessionID sessionID) -> () Async
ScheduleClearInMemoryAndPersistent(PAL::SessionID sessionID, Optional<WallTime> modifiedSince, enum:bool WebKit::ShouldGrandfatherStatistics shouldGrandfather) -> () Async
ScheduleCookieBlockingUpdate(PAL::SessionID sessionID) -> () Async
