Diff
Modified: trunk/Source/WTF/ChangeLog (236484 => 236485)
--- trunk/Source/WTF/ChangeLog 2018-09-25 22:49:34 UTC (rev 236484)
+++ trunk/Source/WTF/ChangeLog 2018-09-25 22:49:47 UTC (rev 236485)
@@ -1,3 +1,14 @@
+2018-09-25 John Wilander <[email protected]>
+
+ Change from HAVE(CFNETWORK_STORAGE_PARTITIONING) to ENABLE(RESOURCE_LOAD_STATISTICS)
+ https://bugs.webkit.org/show_bug.cgi?id=189959
+ <rdar://problem/44767642>
+
+ Reviewed by Chris Dumez.
+
+ * wtf/Platform.h:
+ Enables RESOURCE_LOAD_STATISTICS for Cocoa platforms.
+
2018-09-24 Fujii Hironori <[email protected]>
Rename WTF_COMPILER_GCC_OR_CLANG to WTF_COMPILER_GCC_COMPATIBLE
Modified: trunk/Source/WTF/wtf/Platform.h (236484 => 236485)
--- trunk/Source/WTF/wtf/Platform.h 2018-09-25 22:49:34 UTC (rev 236484)
+++ trunk/Source/WTF/wtf/Platform.h 2018-09-25 22:49:47 UTC (rev 236485)
@@ -694,7 +694,7 @@
#endif /* OS(DARWIN) */
#if PLATFORM(COCOA)
-#define HAVE_CFNETWORK_STORAGE_PARTITIONING 1
+#define ENABLE_RESOURCE_LOAD_STATISTICS 1
#endif
#if OS(DARWIN) || OS(FUCHSIA) || ((OS(FREEBSD) || defined(__GLIBC__) || defined(__BIONIC__)) && (CPU(X86) || CPU(X86_64) || CPU(ARM) || CPU(ARM64) || CPU(MIPS)))
Modified: trunk/Source/WebCore/ChangeLog (236484 => 236485)
--- trunk/Source/WebCore/ChangeLog 2018-09-25 22:49:34 UTC (rev 236484)
+++ trunk/Source/WebCore/ChangeLog 2018-09-25 22:49:47 UTC (rev 236485)
@@ -1,3 +1,36 @@
+2018-09-25 John Wilander <[email protected]>
+
+ Change from HAVE(CFNETWORK_STORAGE_PARTITIONING) to ENABLE(RESOURCE_LOAD_STATISTICS)
+ https://bugs.webkit.org/show_bug.cgi?id=189959
+ <rdar://problem/44767642>
+
+ Reviewed by Chris Dumez.
+
+ No new tests because of no code change.
+
+ We no longer make use of CFNetwork's cookie partitioning so we should
+ change the compile-time flag to something that makes sense. This should
+ also make it easier/cleaner for other ports.
+
+ * dom/Document.cpp:
+ (WebCore::Document::hasStorageAccess):
+ (WebCore::Document::requestStorageAccess):
+ (WebCore::Document::setHasRequestedPageSpecificStorageAccessWithUserInteraction):
+ * dom/Document.h:
+ * loader/EmptyFrameLoaderClient.h:
+ * loader/FrameLoaderClient.h:
+ * loader/ResourceLoadObserver.cpp:
+ (WebCore::ResourceLoadObserver::logUserInteractionWithReducedTimeResolution):
+ (WebCore::ResourceLoadObserver::logWindowCreation):
+ * loader/ResourceLoadObserver.h:
+ * page/DOMWindow.cpp:
+ (WebCore::DOMWindow::createWindow):
+ * platform/network/NetworkStorageSession.h:
+ * platform/network/cf/NetworkStorageSessionCFNet.cpp:
+ * platform/network/cocoa/NetworkStorageSessionCocoa.mm:
+ (WebCore::cookiesForURL):
+ (WebCore::NetworkStorageSession::setCookiesFromDOM const):
+
2018-09-25 Jiewen Tan <[email protected]>
[WebAuthN] Make AuthenticatorManager
Modified: trunk/Source/WebCore/dom/Document.cpp (236484 => 236485)
--- trunk/Source/WebCore/dom/Document.cpp 2018-09-25 22:49:34 UTC (rev 236484)
+++ trunk/Source/WebCore/dom/Document.cpp 2018-09-25 22:49:47 UTC (rev 236485)
@@ -7823,7 +7823,7 @@
{
ASSERT(settings().storageAccessAPIEnabled());
-#if HAVE(CFNETWORK_STORAGE_PARTITIONING)
+#if ENABLE(RESOURCE_LOAD_STATISTICS)
if (m_frame && hasFrameSpecificStorageAccess()) {
promise->resolve<IDLBoolean>(true);
return;
@@ -7874,7 +7874,7 @@
{
ASSERT(settings().storageAccessAPIEnabled());
-#if HAVE(CFNETWORK_STORAGE_PARTITIONING)
+#if ENABLE(RESOURCE_LOAD_STATISTICS)
if (m_frame && hasFrameSpecificStorageAccess()) {
promise->resolve();
return;
@@ -8024,7 +8024,7 @@
m_mainArticleElement = tallestArticle;
}
-#if HAVE(CFNETWORK_STORAGE_PARTITIONING)
+#if ENABLE(RESOURCE_LOAD_STATISTICS)
bool Document::hasFrameSpecificStorageAccess() const
{
return m_frame->loader().client().hasFrameSpecificStorageAccess();
@@ -8044,7 +8044,6 @@
{
m_primaryDomainRequestedPageSpecificStorageAccessWithUserInteraction = primaryDomain;
}
-
#endif
void Document::setConsoleMessageListener(RefPtr<StringCallback>&& listener)
Modified: trunk/Source/WebCore/dom/Document.h (236484 => 236485)
--- trunk/Source/WebCore/dom/Document.h 2018-09-25 22:49:34 UTC (rev 236484)
+++ trunk/Source/WebCore/dom/Document.h 2018-09-25 22:49:47 UTC (rev 236485)
@@ -1478,7 +1478,7 @@
bool handlingTouchEvent() const { return m_handlingTouchEvent; }
#endif
-#if HAVE(CFNETWORK_STORAGE_PARTITIONING)
+#if ENABLE(RESOURCE_LOAD_STATISTICS)
bool hasRequestedPageSpecificStorageAccessWithUserInteraction(const String& primaryDomain);
void setHasRequestedPageSpecificStorageAccessWithUserInteraction(const String& primaryDomain);
#endif
@@ -1826,7 +1826,7 @@
void didLogMessage(const WTFLogChannel&, WTFLogLevel, Vector<JSONLogValue>&&) final;
-#if HAVE(CFNETWORK_STORAGE_PARTITIONING)
+#if ENABLE(RESOURCE_LOAD_STATISTICS)
bool hasFrameSpecificStorageAccess() const;
void setHasFrameSpecificStorageAccess(bool);
#endif
@@ -2021,7 +2021,7 @@
HashSet<ApplicationStateChangeListener*> m_applicationStateChangeListeners;
-#if HAVE(CFNETWORK_STORAGE_PARTITIONING)
+#if ENABLE(RESOURCE_LOAD_STATISTICS)
String m_primaryDomainRequestedPageSpecificStorageAccessWithUserInteraction { };
#endif
Modified: trunk/Source/WebCore/loader/EmptyFrameLoaderClient.h (236484 => 236485)
--- trunk/Source/WebCore/loader/EmptyFrameLoaderClient.h 2018-09-25 22:49:34 UTC (rev 236484)
+++ trunk/Source/WebCore/loader/EmptyFrameLoaderClient.h 2018-09-25 22:49:47 UTC (rev 236485)
@@ -200,7 +200,7 @@
#if USE(QUICK_LOOK)
RefPtr<PreviewLoaderClient> createPreviewLoaderClient(const String&, const String&) final { return nullptr; }
#endif
-#if HAVE(CFNETWORK_STORAGE_PARTITIONING)
+#if ENABLE(RESOURCE_LOAD_STATISTICS)
bool hasFrameSpecificStorageAccess() final { return false; }
void setHasFrameSpecificStorageAccess(bool) final { }
#endif
Modified: trunk/Source/WebCore/loader/FrameLoaderClient.h (236484 => 236485)
--- trunk/Source/WebCore/loader/FrameLoaderClient.h 2018-09-25 22:49:34 UTC (rev 236484)
+++ trunk/Source/WebCore/loader/FrameLoaderClient.h 2018-09-25 22:49:47 UTC (rev 236485)
@@ -375,7 +375,7 @@
virtual void finishedLoadingApplicationManifest(uint64_t, const std::optional<ApplicationManifest>&) { }
#endif
-#if HAVE(CFNETWORK_STORAGE_PARTITIONING)
+#if ENABLE(RESOURCE_LOAD_STATISTICS)
virtual bool hasFrameSpecificStorageAccess() { return false; }
virtual void setHasFrameSpecificStorageAccess(bool) { }
#endif
Modified: trunk/Source/WebCore/loader/ResourceLoadObserver.cpp (236484 => 236485)
--- trunk/Source/WebCore/loader/ResourceLoadObserver.cpp 2018-09-25 22:49:34 UTC (rev 236484)
+++ trunk/Source/WebCore/loader/ResourceLoadObserver.cpp 2018-09-25 22:49:47 UTC (rev 236485)
@@ -179,7 +179,7 @@
statistics.lastSeen = newTime;
statistics.mostRecentUserInteractionTime = newTime;
-#if HAVE(CFNETWORK_STORAGE_PARTITIONING)
+#if ENABLE(RESOURCE_LOAD_STATISTICS)
if (auto* opener = document.frame()->loader().opener()) {
if (auto* openerDocument = opener->document()) {
if (auto* openerFrame = openerDocument->frame()) {
@@ -194,7 +194,7 @@
m_notificationTimer.stop();
notifyObserver();
-#if HAVE(CFNETWORK_STORAGE_PARTITIONING) && !RELEASE_LOG_DISABLED
+#if ENABLE(RESOURCE_LOAD_STATISTICS) && !RELEASE_LOG_DISABLED
if (shouldLogUserInteraction()) {
auto counter = ++m_loggingCounter;
#define LOCAL_LOG(str, ...) \
@@ -218,7 +218,7 @@
void ResourceLoadObserver::logWindowCreation(const URL& popupUrl, uint64_t openerPageID, Document& openerDocument)
{
-#if HAVE(CFNETWORK_STORAGE_PARTITIONING)
+#if ENABLE(RESOURCE_LOAD_STATISTICS)
requestStorageAccessUnderOpener(primaryDomain(popupUrl), openerPageID, openerDocument, false);
#else
UNUSED_PARAM(popupUrl);
@@ -227,7 +227,7 @@
#endif
}
-#if HAVE(CFNETWORK_STORAGE_PARTITIONING)
+#if ENABLE(RESOURCE_LOAD_STATISTICS)
void ResourceLoadObserver::requestStorageAccessUnderOpener(const String& domainInNeedOfStorageAccess, uint64_t openerPageID, Document& openerDocument, bool isTriggeredByUserGesture)
{
auto openerUrl = openerDocument.url();
Modified: trunk/Source/WebCore/loader/ResourceLoadObserver.h (236484 => 236485)
--- trunk/Source/WebCore/loader/ResourceLoadObserver.h 2018-09-25 22:49:34 UTC (rev 236484)
+++ trunk/Source/WebCore/loader/ResourceLoadObserver.h 2018-09-25 22:49:47 UTC (rev 236485)
@@ -75,7 +75,7 @@
WEBCORE_EXPORT void notifyObserver();
WEBCORE_EXPORT void clearState();
-#if HAVE(CFNETWORK_STORAGE_PARTITIONING) && !RELEASE_LOG_DISABLED
+#if ENABLE(RESOURCE_LOAD_STATISTICS) && !RELEASE_LOG_DISABLED
bool shouldLogUserInteraction() const { return m_shouldLogUserInteraction; }
void setShouldLogUserInteraction(bool shouldLogUserInteraction) { m_shouldLogUserInteraction = shouldLogUserInteraction; }
#endif
@@ -89,7 +89,7 @@
void scheduleNotificationIfNeeded();
Vector<ResourceLoadStatistics> takeStatistics();
-#if HAVE(CFNETWORK_STORAGE_PARTITIONING)
+#if ENABLE(RESOURCE_LOAD_STATISTICS)
void requestStorageAccessUnderOpener(const String& domainInNeedOfStorageAccess, uint64_t openerPageID, Document& openerDocument, bool isTriggeredByUserGesture);
#endif
@@ -98,7 +98,7 @@
WTF::Function<void (Vector<ResourceLoadStatistics>&&)> m_notificationCallback;
WTF::Function<void(const String&, uint64_t, const String&, bool)> m_requestStorageAccessUnderOpenerCallback;
Timer m_notificationTimer;
-#if HAVE(CFNETWORK_STORAGE_PARTITIONING) && !RELEASE_LOG_DISABLED
+#if ENABLE(RESOURCE_LOAD_STATISTICS) && !RELEASE_LOG_DISABLED
uint64_t m_loggingCounter { 0 };
bool m_shouldLogUserInteraction { false };
#endif
Modified: trunk/Source/WebCore/page/DOMWindow.cpp (236484 => 236485)
--- trunk/Source/WebCore/page/DOMWindow.cpp 2018-09-25 22:49:34 UTC (rev 236484)
+++ trunk/Source/WebCore/page/DOMWindow.cpp 2018-09-25 22:49:47 UTC (rev 236485)
@@ -2284,7 +2284,7 @@
FrameLoadRequest frameLoadRequest { *activeWindow.document(), activeWindow.document()->securityOrigin(), resourceRequest, "_self"_s, LockHistory::No, LockBackForwardList::No, MaybeSendReferrer, AllowNavigationToInvalidURL::Yes, NewFrameOpenerPolicy::Allow, activeDocument->shouldOpenExternalURLsPolicyToPropagate(), initiatedByMainFrame };
newFrame->loader().changeLocation(WTFMove(frameLoadRequest));
-#if HAVE(CFNETWORK_STORAGE_PARTITIONING)
+#if ENABLE(RESOURCE_LOAD_STATISTICS)
if (auto openerDocument = openerFrame.document()) {
if (auto openerPageID = openerFrame.loader().client().pageID())
ResourceLoadObserver::shared().logWindowCreation(completedURL, openerPageID.value(), *openerDocument);
Modified: trunk/Source/WebCore/platform/network/NetworkStorageSession.h (236484 => 236485)
--- trunk/Source/WebCore/platform/network/NetworkStorageSession.h 2018-09-25 22:49:34 UTC (rev 236484)
+++ trunk/Source/WebCore/platform/network/NetworkStorageSession.h 2018-09-25 22:49:47 UTC (rev 236485)
@@ -99,7 +99,7 @@
CFURLStorageSessionRef platformSession() { return m_platformSession.get(); }
WEBCORE_EXPORT RetainPtr<CFHTTPCookieStorageRef> cookieStorage() const;
WEBCORE_EXPORT static void setStorageAccessAPIEnabled(bool);
-#if HAVE(CFNETWORK_STORAGE_PARTITIONING)
+#if ENABLE(RESOURCE_LOAD_STATISTICS)
WEBCORE_EXPORT bool shouldBlockCookies(const ResourceRequest&, std::optional<uint64_t> frameID, std::optional<uint64_t> pageID) const;
WEBCORE_EXPORT bool shouldBlockCookies(const URL& firstPartyForCookies, const URL& resource, std::optional<uint64_t> frameID, std::optional<uint64_t> pageID) const;
WEBCORE_EXPORT void setPrevalentDomainsToBlockCookiesFor(const Vector<String>& domainsToBlock, bool clearFirst);
@@ -185,7 +185,7 @@
CredentialStorage m_credentialStorage;
-#if HAVE(CFNETWORK_STORAGE_PARTITIONING)
+#if ENABLE(RESOURCE_LOAD_STATISTICS)
bool shouldBlockThirdPartyCookies(const String& topPrivatelyControlledDomain) const;
HashSet<String> m_topPrivatelyControlledDomainsToBlock;
HashMap<uint64_t, HashMap<uint64_t, String, DefaultHash<uint64_t>::Hash, WTF::UnsignedWithZeroKeyHashTraits<uint64_t>>, DefaultHash<uint64_t>::Hash, WTF::UnsignedWithZeroKeyHashTraits<uint64_t>> m_framesGrantedStorageAccess;
Modified: trunk/Source/WebCore/platform/network/cf/NetworkStorageSessionCFNet.cpp (236484 => 236485)
--- trunk/Source/WebCore/platform/network/cf/NetworkStorageSessionCFNet.cpp 2018-09-25 22:49:34 UTC (rev 236484)
+++ trunk/Source/WebCore/platform/network/cf/NetworkStorageSessionCFNet.cpp 2018-09-25 22:49:47 UTC (rev 236485)
@@ -220,7 +220,7 @@
storageAccessAPIEnabled = enabled;
}
-#if HAVE(CFNETWORK_STORAGE_PARTITIONING)
+#if ENABLE(RESOURCE_LOAD_STATISTICS)
static inline String getPartitioningDomain(const URL& url)
{
@@ -386,7 +386,7 @@
{
m_cacheMaxAgeCapForPrevalentResources = std::nullopt;
}
-#endif // HAVE(CFNETWORK_STORAGE_PARTITIONING)
+#endif // ENABLE(RESOURCE_LOAD_STATISTICS)
#if !PLATFORM(COCOA)
void NetworkStorageSession::setCookies(const Vector<Cookie>&, const URL&, const URL&)
Modified: trunk/Source/WebCore/platform/network/cocoa/NetworkStorageSessionCocoa.mm (236484 => 236485)
--- trunk/Source/WebCore/platform/network/cocoa/NetworkStorageSessionCocoa.mm 2018-09-25 22:49:34 UTC (rev 236484)
+++ trunk/Source/WebCore/platform/network/cocoa/NetworkStorageSessionCocoa.mm 2018-09-25 22:49:47 UTC (rev 236485)
@@ -298,7 +298,7 @@
static NSArray *cookiesForURL(const NetworkStorageSession& session, const URL& firstParty, const SameSiteInfo& sameSiteInfo, const URL& url, std::optional<uint64_t> frameID, std::optional<uint64_t> pageID)
{
-#if HAVE(CFNETWORK_STORAGE_PARTITIONING)
+#if ENABLE(RESOURCE_LOAD_STATISTICS)
if (session.shouldBlockCookies(firstParty, url, frameID, pageID))
return nil;
#else
@@ -407,7 +407,7 @@
RetainPtr<NSArray> filteredCookies = filterCookies(unfilteredCookies);
ASSERT([filteredCookies.get() count] <= 1);
-#if HAVE(CFNETWORK_STORAGE_PARTITIONING)
+#if ENABLE(RESOURCE_LOAD_STATISTICS)
if (shouldBlockCookies(firstParty, url, frameID, pageID))
return;
#else
Modified: trunk/Source/WebKit/ChangeLog (236484 => 236485)
--- trunk/Source/WebKit/ChangeLog 2018-09-25 22:49:34 UTC (rev 236484)
+++ trunk/Source/WebKit/ChangeLog 2018-09-25 22:49:47 UTC (rev 236485)
@@ -1,3 +1,76 @@
+2018-09-25 John Wilander <[email protected]>
+
+ Change from HAVE(CFNETWORK_STORAGE_PARTITIONING) to ENABLE(RESOURCE_LOAD_STATISTICS)
+ https://bugs.webkit.org/show_bug.cgi?id=189959
+ <rdar://problem/44767642>
+
+ Reviewed by Chris Dumez.
+
+ We no longer make use of CFNetwork's cookie partitioning so we should
+ change the compile-time flag to something that makes sense. This should
+ also make it easier/cleaner for other ports.
+
+ * NetworkProcess/NetworkConnectionToWebProcess.cpp:
+ (WebKit::NetworkConnectionToWebProcess::cookiesForDOM):
+ (WebKit::NetworkConnectionToWebProcess::setCookiesFromDOM):
+ (WebKit::NetworkConnectionToWebProcess::removeStorageAccessForFrame):
+ (WebKit::NetworkConnectionToWebProcess::removeStorageAccessForAllFramesOnPage):
+ * NetworkProcess/NetworkProcess.cpp:
+ (WebKit::NetworkProcess::initializeNetworkProcess):
+ * NetworkProcess/NetworkProcess.h:
+ * NetworkProcess/NetworkProcess.messages.in:
+ * NetworkProcess/NetworkProcessCreationParameters.cpp:
+ (WebKit::NetworkProcessCreationParameters::encode const):
+ (WebKit::NetworkProcessCreationParameters::decode):
+ * NetworkProcess/NetworkProcessCreationParameters.h:
+ * NetworkProcess/NetworkResourceLoader.cpp:
+ (WebKit::NetworkResourceLoader::didFinishLoading):
+ (WebKit::NetworkResourceLoader::sendResultForCacheEntry):
+ * NetworkProcess/NetworkResourceLoader.h:
+ * NetworkProcess/cache/NetworkCache.cpp:
+ (WebKit::NetworkCache::Cache::retrieve):
+ * NetworkProcess/cocoa/NetworkDataTaskCocoa.h:
+ * NetworkProcess/cocoa/NetworkDataTaskCocoa.mm:
+ (WebKit::NetworkDataTaskCocoa::applyCookieBlockingPolicy):
+ (WebKit::NetworkDataTaskCocoa::NetworkDataTaskCocoa):
+ (WebKit::NetworkDataTaskCocoa::willPerformHTTPRedirection):
+ * Shared/WebProcessCreationParameters.cpp:
+ (WebKit::WebProcessCreationParameters::encode const):
+ (WebKit::WebProcessCreationParameters::decode):
+ * Shared/WebProcessCreationParameters.h:
+ * UIProcess/Cocoa/WebProcessPoolCocoa.mm:
+ (WebKit::WebProcessPool::platformInitializeWebProcess):
+ (WebKit::WebProcessPool::platformInitializeNetworkProcess):
+ * UIProcess/Network/NetworkProcessProxy.cpp:
+ * UIProcess/Network/NetworkProcessProxy.h:
+ * UIProcess/Network/NetworkProcessProxy.messages.in:
+ * UIProcess/WebPageProxy.cpp:
+ * UIProcess/WebPageProxy.h:
+ * UIProcess/WebPageProxy.messages.in:
+ * UIProcess/WebResourceLoadStatisticsStore.cpp:
+ (WebKit::WebResourceLoadStatisticsStore::callHasStorageAccessForFrameHandler):
+ (WebKit::WebResourceLoadStatisticsStore::callGrantStorageAccessHandler):
+ (WebKit::WebResourceLoadStatisticsStore::removeAllStorageAccess):
+ (WebKit::WebResourceLoadStatisticsStore::setCacheMaxAgeCap):
+ (WebKit::WebResourceLoadStatisticsStore::callUpdatePrevalentDomainsToBlockCookiesForHandler):
+ (WebKit::WebResourceLoadStatisticsStore::callRemoveDomainsHandler):
+ * UIProcess/WebsiteData/WebsiteDataStore.cpp:
+ (WebKit::WebsiteDataStore::setCacheMaxAgeCapForPrevalentResources):
+ (WebKit::WebsiteDataStore::resetCacheMaxAgeCapForPrevalentResources):
+ (WebKit::WebsiteDataStore::networkProcessDidCrash):
+ * UIProcess/WebsiteData/WebsiteDataStore.h:
+ * WebProcess/WebCoreSupport/WebChromeClient.cpp:
+ * WebProcess/WebCoreSupport/WebChromeClient.h:
+ * WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp:
+ (WebKit::WebFrameLoaderClient::detachedFromParent2):
+ (WebKit::WebFrameLoaderClient::dispatchWillChangeDocument):
+ * WebProcess/WebCoreSupport/WebFrameLoaderClient.h:
+ * WebProcess/WebPage/WebPage.cpp:
+ * WebProcess/WebPage/WebPage.h:
+ * WebProcess/WebPage/WebPage.messages.in:
+ * WebProcess/WebProcess.cpp:
+ (WebKit::WebProcess::initializeWebProcess):
+
2018-09-25 Philippe Normand <[email protected]>
[WPE] Export jsc_ symbols
Modified: trunk/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.cpp (236484 => 236485)
--- trunk/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.cpp 2018-09-25 22:49:34 UTC (rev 236484)
+++ trunk/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.cpp 2018-09-25 22:49:47 UTC (rev 236485)
@@ -449,7 +449,7 @@
{
auto& networkStorageSession = storageSession(sessionID);
std::tie(cookieString, secureCookiesAccessed) = networkStorageSession.cookiesForDOM(firstParty, sameSiteInfo, url, frameID, pageID, includeSecureCookies);
-#if HAVE(CFNETWORK_STORAGE_PARTITIONING) && !RELEASE_LOG_DISABLED
+#if ENABLE(RESOURCE_LOAD_STATISTICS) && !RELEASE_LOG_DISABLED
if (NetworkProcess::singleton().shouldLogCookieInformation())
NetworkResourceLoader::logCookieInformation("NetworkConnectionToWebProcess::cookiesForDOM", reinterpret_cast<const void*>(this), networkStorageSession, firstParty, sameSiteInfo, url, emptyString(), frameID, pageID, std::nullopt);
#endif
@@ -459,7 +459,7 @@
{
auto& networkStorageSession = storageSession(sessionID);
networkStorageSession.setCookiesFromDOM(firstParty, sameSiteInfo, url, frameID, pageID, cookieString);
-#if HAVE(CFNETWORK_STORAGE_PARTITIONING) && !RELEASE_LOG_DISABLED
+#if ENABLE(RESOURCE_LOAD_STATISTICS) && !RELEASE_LOG_DISABLED
if (NetworkProcess::singleton().shouldLogCookieInformation())
NetworkResourceLoader::logCookieInformation("NetworkConnectionToWebProcess::setCookiesFromDOM", reinterpret_cast<const void*>(this), networkStorageSession, firstParty, sameSiteInfo, url, emptyString(), frameID, pageID, std::nullopt);
#endif
@@ -585,7 +585,7 @@
void NetworkConnectionToWebProcess::removeStorageAccessForFrame(PAL::SessionID sessionID, uint64_t frameID, uint64_t pageID)
{
-#if HAVE(CFNETWORK_STORAGE_PARTITIONING)
+#if ENABLE(RESOURCE_LOAD_STATISTICS)
if (auto* storageSession = NetworkStorageSession::storageSession(sessionID))
storageSession->removeStorageAccessForFrame(frameID, pageID);
#else
@@ -597,7 +597,7 @@
void NetworkConnectionToWebProcess::removeStorageAccessForAllFramesOnPage(PAL::SessionID sessionID, uint64_t pageID)
{
-#if HAVE(CFNETWORK_STORAGE_PARTITIONING)
+#if ENABLE(RESOURCE_LOAD_STATISTICS)
if (auto* storageSession = NetworkStorageSession::storageSession(sessionID))
storageSession->removeStorageAccessForAllFramesOnPage(pageID);
#else
Modified: trunk/Source/WebKit/NetworkProcess/NetworkProcess.cpp (236484 => 236485)
--- trunk/Source/WebKit/NetworkProcess/NetworkProcess.cpp 2018-09-25 22:49:34 UTC (rev 236484)
+++ trunk/Source/WebKit/NetworkProcess/NetworkProcess.cpp 2018-09-25 22:49:47 UTC (rev 236485)
@@ -303,7 +303,7 @@
if (parameters.shouldUseTestingNetworkSession)
NetworkStorageSession::switchToNewTestingSession();
-#if HAVE(CFNETWORK_STORAGE_PARTITIONING) && !RELEASE_LOG_DISABLED
+#if ENABLE(RESOURCE_LOAD_STATISTICS) && !RELEASE_LOG_DISABLED
m_logCookieInformation = parameters.logCookieInformation;
#endif
@@ -480,7 +480,7 @@
});
}
-#if HAVE(CFNETWORK_STORAGE_PARTITIONING)
+#if ENABLE(RESOURCE_LOAD_STATISTICS)
void NetworkProcess::updatePrevalentDomainsToBlockCookiesFor(PAL::SessionID sessionID, const Vector<String>& domainsToBlock, bool shouldClearFirst, uint64_t contextId)
{
if (auto* networkStorageSession = NetworkStorageSession::storageSession(sessionID))
Modified: trunk/Source/WebKit/NetworkProcess/NetworkProcess.h (236484 => 236485)
--- trunk/Source/WebKit/NetworkProcess/NetworkProcess.h 2018-09-25 22:49:34 UTC (rev 236484)
+++ trunk/Source/WebKit/NetworkProcess/NetworkProcess.h 2018-09-25 22:49:47 UTC (rev 236485)
@@ -156,7 +156,7 @@
void addWebsiteDataStore(WebsiteDataStoreParameters&&);
-#if HAVE(CFNETWORK_STORAGE_PARTITIONING)
+#if ENABLE(RESOURCE_LOAD_STATISTICS)
void updatePrevalentDomainsToBlockCookiesFor(PAL::SessionID, const Vector<String>& domainsToBlock, bool shouldClearFirst, uint64_t contextId);
void hasStorageAccessForFrame(PAL::SessionID, const String& resourceDomain, const String& firstPartyDomain, uint64_t frameID, uint64_t pageID, uint64_t contextId);
void getAllStorageAccessEntries(PAL::SessionID, uint64_t contextId);
@@ -174,7 +174,7 @@
void preconnectTo(const WebCore::URL&, WebCore::StoredCredentialsPolicy);
-#if HAVE(CFNETWORK_STORAGE_PARTITIONING) && !RELEASE_LOG_DISABLED
+#if ENABLE(RESOURCE_LOAD_STATISTICS) && !RELEASE_LOG_DISABLED
bool shouldLogCookieInformation() const { return m_logCookieInformation; }
#endif
@@ -362,7 +362,7 @@
bool m_diskCacheIsDisabledForTesting;
bool m_canHandleHTTPSServerTrustEvaluation;
Seconds m_loadThrottleLatency;
-#if HAVE(CFNETWORK_STORAGE_PARTITIONING) && !RELEASE_LOG_DISABLED
+#if ENABLE(RESOURCE_LOAD_STATISTICS) && !RELEASE_LOG_DISABLED
bool m_logCookieInformation { false };
#endif
Modified: trunk/Source/WebKit/NetworkProcess/NetworkProcess.messages.in (236484 => 236485)
--- trunk/Source/WebKit/NetworkProcess/NetworkProcess.messages.in 2018-09-25 22:49:34 UTC (rev 236484)
+++ trunk/Source/WebKit/NetworkProcess/NetworkProcess.messages.in 2018-09-25 22:49:47 UTC (rev 236485)
@@ -81,7 +81,7 @@
PreconnectTo(WebCore::URL url, enum WebCore::StoredCredentialsPolicy storedCredentialsPolicy);
-#if HAVE(CFNETWORK_STORAGE_PARTITIONING)
+#if ENABLE(RESOURCE_LOAD_STATISTICS)
UpdatePrevalentDomainsToBlockCookiesFor(PAL::SessionID sessionID, Vector<String> domainsToBlock, bool shouldClearFirst, uint64_t contextId)
HasStorageAccessForFrame(PAL::SessionID sessionID, String resourceDomain, String firstPartyDomain, uint64_t frameID, uint64_t pageID, uint64_t contextId)
GetAllStorageAccessEntries(PAL::SessionID sessionID, uint64_t contextId)
Modified: trunk/Source/WebKit/NetworkProcess/NetworkProcessCreationParameters.cpp (236484 => 236485)
--- trunk/Source/WebKit/NetworkProcess/NetworkProcessCreationParameters.cpp 2018-09-25 22:49:34 UTC (rev 236484)
+++ trunk/Source/WebKit/NetworkProcess/NetworkProcessCreationParameters.cpp 2018-09-25 22:49:47 UTC (rev 236485)
@@ -89,7 +89,7 @@
#elif USE(CURL)
encoder << cookiePersistentStorageFile;
#endif
-#if HAVE(CFNETWORK_STORAGE_PARTITIONING) && !RELEASE_LOG_DISABLED
+#if ENABLE(RESOURCE_LOAD_STATISTICS) && !RELEASE_LOG_DISABLED
encoder << logCookieInformation;
#endif
#if ENABLE(NETWORK_CAPTURE)
@@ -222,7 +222,7 @@
return false;
#endif
-#if HAVE(CFNETWORK_STORAGE_PARTITIONING) && !RELEASE_LOG_DISABLED
+#if ENABLE(RESOURCE_LOAD_STATISTICS) && !RELEASE_LOG_DISABLED
if (!decoder.decode(result.logCookieInformation))
return false;
#endif
Modified: trunk/Source/WebKit/NetworkProcess/NetworkProcessCreationParameters.h (236484 => 236485)
--- trunk/Source/WebKit/NetworkProcess/NetworkProcessCreationParameters.h 2018-09-25 22:49:34 UTC (rev 236484)
+++ trunk/Source/WebKit/NetworkProcess/NetworkProcessCreationParameters.h 2018-09-25 22:49:47 UTC (rev 236485)
@@ -104,7 +104,7 @@
String cookiePersistentStorageFile;
#endif
-#if HAVE(CFNETWORK_STORAGE_PARTITIONING) && !RELEASE_LOG_DISABLED
+#if ENABLE(RESOURCE_LOAD_STATISTICS) && !RELEASE_LOG_DISABLED
bool logCookieInformation { false };
#endif
Modified: trunk/Source/WebKit/NetworkProcess/NetworkResourceLoader.cpp (236484 => 236485)
--- trunk/Source/WebKit/NetworkProcess/NetworkResourceLoader.cpp 2018-09-25 22:49:34 UTC (rev 236484)
+++ trunk/Source/WebKit/NetworkProcess/NetworkResourceLoader.cpp 2018-09-25 22:49:47 UTC (rev 236485)
@@ -58,7 +58,7 @@
#include <WebCore/SynchronousLoaderClient.h>
#include <wtf/RunLoop.h>
-#if HAVE(CFNETWORK_STORAGE_PARTITIONING) && !RELEASE_LOG_DISABLED
+#if ENABLE(RESOURCE_LOAD_STATISTICS) && !RELEASE_LOG_DISABLED
#include <WebCore/NetworkStorageSession.h>
#endif
@@ -538,7 +538,7 @@
return;
}
-#if HAVE(CFNETWORK_STORAGE_PARTITIONING) && !RELEASE_LOG_DISABLED
+#if ENABLE(RESOURCE_LOAD_STATISTICS) && !RELEASE_LOG_DISABLED
if (shouldLogCookieInformation())
logCookieInformation();
#endif
@@ -847,7 +847,7 @@
}
#endif
-#if HAVE(CFNETWORK_STORAGE_PARTITIONING) && !RELEASE_LOG_DISABLED
+#if ENABLE(RESOURCE_LOAD_STATISTICS) && !RELEASE_LOG_DISABLED
if (shouldLogCookieInformation())
logCookieInformation();
#endif
@@ -946,7 +946,7 @@
return m_connection->captureExtraNetworkLoadMetricsEnabled();
}
-#if HAVE(CFNETWORK_STORAGE_PARTITIONING) && !RELEASE_LOG_DISABLED
+#if ENABLE(RESOURCE_LOAD_STATISTICS) && !RELEASE_LOG_DISABLED
bool NetworkResourceLoader::shouldLogCookieInformation()
{
return NetworkProcess::singleton().shouldLogCookieInformation();
Modified: trunk/Source/WebKit/NetworkProcess/NetworkResourceLoader.h (236484 => 236485)
--- trunk/Source/WebKit/NetworkProcess/NetworkResourceLoader.h 2018-09-25 22:49:34 UTC (rev 236484)
+++ trunk/Source/WebKit/NetworkProcess/NetworkResourceLoader.h 2018-09-25 22:49:47 UTC (rev 236485)
@@ -111,7 +111,7 @@
bool isAlwaysOnLoggingAllowed() const;
-#if HAVE(CFNETWORK_STORAGE_PARTITIONING) && !RELEASE_LOG_DISABLED
+#if ENABLE(RESOURCE_LOAD_STATISTICS) && !RELEASE_LOG_DISABLED
static bool shouldLogCookieInformation();
static void logCookieInformation(const String& label, const void* loggedObject, const WebCore::NetworkStorageSession&, const WebCore::URL& firstParty, const WebCore::SameSiteInfo&, const WebCore::URL&, const String& referrer, std::optional<uint64_t> frameID, std::optional<uint64_t> pageID, std::optional<uint64_t> identifier);
#endif
@@ -159,7 +159,7 @@
void consumeSandboxExtensions();
void invalidateSandboxExtensions();
-#if HAVE(CFNETWORK_STORAGE_PARTITIONING) && !RELEASE_LOG_DISABLED
+#if ENABLE(RESOURCE_LOAD_STATISTICS) && !RELEASE_LOG_DISABLED
void logCookieInformation() const;
#endif
Modified: trunk/Source/WebKit/NetworkProcess/cache/NetworkCache.cpp (236484 => 236485)
--- trunk/Source/WebKit/NetworkProcess/cache/NetworkCache.cpp 2018-09-25 22:49:34 UTC (rev 236484)
+++ trunk/Source/WebKit/NetworkProcess/cache/NetworkCache.cpp 2018-09-25 22:49:47 UTC (rev 236485)
@@ -341,7 +341,7 @@
auto entry = Entry::decodeStorageRecord(*record);
std::optional<Seconds> maxAgeCap;
-#if HAVE(CFNETWORK_STORAGE_PARTITIONING)
+#if ENABLE(RESOURCE_LOAD_STATISTICS)
if (auto networkStorageSession = WebCore::NetworkStorageSession::storageSession(sessionID))
maxAgeCap = networkStorageSession->maxAgeCacheCap(request);
#endif
Modified: trunk/Source/WebKit/NetworkProcess/cocoa/NetworkDataTaskCocoa.h (236484 => 236485)
--- trunk/Source/WebKit/NetworkProcess/cocoa/NetworkDataTaskCocoa.h 2018-09-25 22:49:34 UTC (rev 236484)
+++ trunk/Source/WebKit/NetworkProcess/cocoa/NetworkDataTaskCocoa.h 2018-09-25 22:49:47 UTC (rev 236485)
@@ -89,7 +89,7 @@
bool tryPasswordBasedAuthentication(const WebCore::AuthenticationChallenge&, ChallengeCompletionHandler&);
void applySniffingPoliciesAndBindRequestToInferfaceIfNeeded(__strong NSURLRequest*&, bool shouldContentSniff, bool shouldContentEncodingSniff);
-#if HAVE(CFNETWORK_STORAGE_PARTITIONING)
+#if ENABLE(RESOURCE_LOAD_STATISTICS)
static NSHTTPCookieStorage *statelessCookieStorage();
void applyCookieBlockingPolicy(bool shouldBlock);
#endif
@@ -102,7 +102,7 @@
uint64_t m_frameID;
uint64_t m_pageID;
-#if HAVE(CFNETWORK_STORAGE_PARTITIONING)
+#if ENABLE(RESOURCE_LOAD_STATISTICS)
bool m_hasBeenSetToUseStatelessCookieStorage { false };
#endif
Modified: trunk/Source/WebKit/NetworkProcess/cocoa/NetworkDataTaskCocoa.mm (236484 => 236485)
--- trunk/Source/WebKit/NetworkProcess/cocoa/NetworkDataTaskCocoa.mm 2018-09-25 22:49:34 UTC (rev 236484)
+++ trunk/Source/WebKit/NetworkProcess/cocoa/NetworkDataTaskCocoa.mm 2018-09-25 22:49:47 UTC (rev 236485)
@@ -112,8 +112,7 @@
nsRequest = mutableRequest.autorelease();
}
-#if HAVE(CFNETWORK_STORAGE_PARTITIONING)
-
+#if ENABLE(RESOURCE_LOAD_STATISTICS)
NSHTTPCookieStorage *NetworkDataTaskCocoa::statelessCookieStorage()
{
static NeverDestroyed<RetainPtr<NSHTTPCookieStorage>> statelessCookieStorage;
@@ -142,7 +141,6 @@
[m_task _setExplicitCookieStorage:storage._cookieStorage];
m_hasBeenSetToUseStatelessCookieStorage = shouldBlock;
}
-
#endif
bool NetworkDataTaskCocoa::isThirdPartyRequest(const WebCore::ResourceRequest& request)
@@ -197,7 +195,7 @@
#endif
bool shouldBlockCookies = false;
-#if HAVE(CFNETWORK_STORAGE_PARTITIONING)
+#if ENABLE(RESOURCE_LOAD_STATISTICS)
shouldBlockCookies = session.networkStorageSession().shouldBlockCookies(request, frameID, pageID);
#endif
if (shouldBlockCookies || (m_session->sessionID().isEphemeral() && isThirdPartyRequest(request)))
@@ -230,7 +228,7 @@
#endif
}
-#if HAVE(CFNETWORK_STORAGE_PARTITIONING)
+#if ENABLE(RESOURCE_LOAD_STATISTICS)
if (shouldBlockCookies) {
#if !RELEASE_LOG_DISABLED
if (NetworkProcess::singleton().shouldLogCookieInformation())
@@ -347,7 +345,7 @@
request.setFirstPartyForCookies(request.url());
bool shouldBlockCookies = false;
-#if HAVE(CFNETWORK_STORAGE_PARTITIONING)
+#if ENABLE(RESOURCE_LOAD_STATISTICS)
shouldBlockCookies = m_session->networkStorageSession().shouldBlockCookies(request, m_frameID, m_pageID);
#if !RELEASE_LOG_DISABLED
if (NetworkProcess::singleton().shouldLogCookieInformation())
@@ -360,7 +358,7 @@
if (shouldBlockCookies || (m_session->sessionID().isEphemeral() && isThirdPartyRequest(request)))
request.setExistingHTTPReferrerToOriginString();
-#if HAVE(CFNETWORK_STORAGE_PARTITIONING)
+#if ENABLE(RESOURCE_LOAD_STATISTICS)
// Always apply the policy since blocking may need to be turned on or off in a redirect.
applyCookieBlockingPolicy(shouldBlockCookies);
Modified: trunk/Source/WebKit/Shared/WebProcessCreationParameters.cpp (236484 => 236485)
--- trunk/Source/WebKit/Shared/WebProcessCreationParameters.cpp 2018-09-25 22:49:34 UTC (rev 236484)
+++ trunk/Source/WebKit/Shared/WebProcessCreationParameters.cpp 2018-09-25 22:49:47 UTC (rev 236485)
@@ -149,7 +149,7 @@
encoder << proxySettings;
#endif
-#if HAVE(CFNETWORK_STORAGE_PARTITIONING) && !RELEASE_LOG_DISABLED
+#if ENABLE(RESOURCE_LOAD_STATISTICS) && !RELEASE_LOG_DISABLED
encoder << shouldLogUserInteraction;
#endif
@@ -402,7 +402,7 @@
return false;
#endif
-#if HAVE(CFNETWORK_STORAGE_PARTITIONING) && !RELEASE_LOG_DISABLED
+#if ENABLE(RESOURCE_LOAD_STATISTICS) && !RELEASE_LOG_DISABLED
if (!decoder.decode(parameters.shouldLogUserInteraction))
return false;
#endif
Modified: trunk/Source/WebKit/Shared/WebProcessCreationParameters.h (236484 => 236485)
--- trunk/Source/WebKit/Shared/WebProcessCreationParameters.h 2018-09-25 22:49:34 UTC (rev 236484)
+++ trunk/Source/WebKit/Shared/WebProcessCreationParameters.h 2018-09-25 22:49:47 UTC (rev 236485)
@@ -192,7 +192,7 @@
Vector<String> mediaMIMETypes;
#endif
-#if HAVE(CFNETWORK_STORAGE_PARTITIONING) && !RELEASE_LOG_DISABLED
+#if ENABLE(RESOURCE_LOAD_STATISTICS) && !RELEASE_LOG_DISABLED
bool shouldLogUserInteraction { false };
#endif
Modified: trunk/Source/WebKit/UIProcess/Cocoa/WebProcessPoolCocoa.mm (236484 => 236485)
--- trunk/Source/WebKit/UIProcess/Cocoa/WebProcessPoolCocoa.mm 2018-09-25 22:49:34 UTC (rev 236484)
+++ trunk/Source/WebKit/UIProcess/Cocoa/WebProcessPoolCocoa.mm 2018-09-25 22:49:47 UTC (rev 236485)
@@ -77,7 +77,7 @@
static NSString * const WebKitSuppressMemoryPressureHandlerDefaultsKey = @"WebKitSuppressMemoryPressureHandler";
static NSString * const WebKitNetworkLoadThrottleLatencyMillisecondsDefaultsKey = @"WebKitNetworkLoadThrottleLatencyMilliseconds";
-#if HAVE(CFNETWORK_STORAGE_PARTITIONING) && !RELEASE_LOG_DISABLED
+#if ENABLE(RESOURCE_LOAD_STATISTICS) && !RELEASE_LOG_DISABLED
static NSString * const WebKitLogCookieInformationDefaultsKey = @"WebKitLogCookieInformation";
#endif
@@ -263,7 +263,7 @@
SandboxExtension::createHandleForGenericExtension("com.apple.webkit.microphone", parameters.audioCaptureExtensionHandle);
#endif
-#if HAVE(CFNETWORK_STORAGE_PARTITIONING) && !RELEASE_LOG_DISABLED
+#if ENABLE(RESOURCE_LOAD_STATISTICS) && !RELEASE_LOG_DISABLED
parameters.shouldLogUserInteraction = [defaults boolForKey:WebKitLogCookieInformationDefaultsKey];
#endif
@@ -305,7 +305,7 @@
parameters.storageAccessAPIEnabled = storageAccessAPIEnabled();
parameters.suppressesConnectionTerminationOnSystemChange = m_configuration->suppressesConnectionTerminationOnSystemChange();
-#if HAVE(CFNETWORK_STORAGE_PARTITIONING) && !RELEASE_LOG_DISABLED
+#if ENABLE(RESOURCE_LOAD_STATISTICS) && !RELEASE_LOG_DISABLED
parameters.logCookieInformation = [defaults boolForKey:WebKitLogCookieInformationDefaultsKey];
#endif
Modified: trunk/Source/WebKit/UIProcess/Network/NetworkProcessProxy.cpp (236484 => 236485)
--- trunk/Source/WebKit/UIProcess/Network/NetworkProcessProxy.cpp 2018-09-25 22:49:34 UTC (rev 236484)
+++ trunk/Source/WebKit/UIProcess/Network/NetworkProcessProxy.cpp 2018-09-25 22:49:47 UTC (rev 236485)
@@ -394,7 +394,7 @@
page->logDiagnosticMessageWithValue(message, description, value, significantFigures, shouldSample);
}
-#if HAVE(CFNETWORK_STORAGE_PARTITIONING)
+#if ENABLE(RESOURCE_LOAD_STATISTICS)
void NetworkProcessProxy::updatePrevalentDomainsToBlockCookiesFor(PAL::SessionID sessionID, const Vector<String>& domainsToBlock, ShouldClearFirst shouldClearFirst, CompletionHandler<void()>&& completionHandler)
{
if (!canSendMessage()) {
Modified: trunk/Source/WebKit/UIProcess/Network/NetworkProcessProxy.h (236484 => 236485)
--- trunk/Source/WebKit/UIProcess/Network/NetworkProcessProxy.h 2018-09-25 22:49:34 UTC (rev 236484)
+++ trunk/Source/WebKit/UIProcess/Network/NetworkProcessProxy.h 2018-09-25 22:49:47 UTC (rev 236485)
@@ -77,7 +77,7 @@
void deleteWebsiteData(PAL::SessionID, OptionSet<WebsiteDataType>, WallTime modifiedSince, CompletionHandler<void()>&& completionHandler);
void deleteWebsiteDataForOrigins(PAL::SessionID, OptionSet<WebKit::WebsiteDataType>, const Vector<WebCore::SecurityOriginData>& origins, const Vector<String>& cookieHostNames, const Vector<String>& HSTSCacheHostNames, CompletionHandler<void()>&&);
-#if HAVE(CFNETWORK_STORAGE_PARTITIONING)
+#if ENABLE(RESOURCE_LOAD_STATISTICS)
void updatePrevalentDomainsToBlockCookiesFor(PAL::SessionID, const Vector<String>& domainsToBlock, ShouldClearFirst, CompletionHandler<void()>&&);
void hasStorageAccessForFrame(PAL::SessionID, const String& resourceDomain, const String& firstPartyDomain, uint64_t frameID, uint64_t pageID, CompletionHandler<void(bool)>&& callback);
void getAllStorageAccessEntries(PAL::SessionID, CompletionHandler<void(Vector<String>&& domains)>&&);
@@ -142,7 +142,7 @@
void logDiagnosticMessage(uint64_t pageID, const String& message, const String& description, WebCore::ShouldSample);
void logDiagnosticMessageWithResult(uint64_t pageID, const String& message, const String& description, uint32_t result, WebCore::ShouldSample);
void logDiagnosticMessageWithValue(uint64_t pageID, const String& message, const String& description, double value, unsigned significantFigures, WebCore::ShouldSample);
-#if HAVE(CFNETWORK_STORAGE_PARTITIONING)
+#if ENABLE(RESOURCE_LOAD_STATISTICS)
void didUpdateBlockCookies(uint64_t contextId);
void storageAccessRequestResult(bool wasGranted, uint64_t contextId);
void allStorageAccessEntriesResult(Vector<String>&& domains, uint64_t contextId);
Modified: trunk/Source/WebKit/UIProcess/Network/NetworkProcessProxy.messages.in (236484 => 236485)
--- trunk/Source/WebKit/UIProcess/Network/NetworkProcessProxy.messages.in 2018-09-25 22:49:34 UTC (rev 236484)
+++ trunk/Source/WebKit/UIProcess/Network/NetworkProcessProxy.messages.in 2018-09-25 22:49:47 UTC (rev 236485)
@@ -41,7 +41,7 @@
LogDiagnosticMessageWithResult(uint64_t pageID, String message, String description, uint32_t result, enum WebCore::ShouldSample shouldSample)
LogDiagnosticMessageWithValue(uint64_t pageID, String message, String description, double value, unsigned significantFigures, enum WebCore::ShouldSample shouldSample)
-#if HAVE(CFNETWORK_STORAGE_PARTITIONING)
+#if ENABLE(RESOURCE_LOAD_STATISTICS)
DidUpdateBlockCookies(uint64_t callbackId)
StorageAccessRequestResult(bool wasGranted, uint64_t contextId)
AllStorageAccessEntriesResult(Vector<String> domains, uint64_t contextId)
Modified: trunk/Source/WebKit/UIProcess/WebPageProxy.cpp (236484 => 236485)
--- trunk/Source/WebKit/UIProcess/WebPageProxy.cpp 2018-09-25 22:49:34 UTC (rev 236484)
+++ trunk/Source/WebKit/UIProcess/WebPageProxy.cpp 2018-09-25 22:49:47 UTC (rev 236485)
@@ -214,7 +214,7 @@
#include "WebAuthenticatorCoordinatorProxy.h"
#endif
-#if HAVE(CFNETWORK_STORAGE_PARTITIONING)
+#if ENABLE(RESOURCE_LOAD_STATISTICS)
#include "WebResourceLoadStatisticsStore.h"
#endif
@@ -7656,7 +7656,7 @@
iterator->value->startTask(*this, parameters.taskIdentifier, WTFMove(parameters.request), WTFMove(reply));
}
-#if HAVE(CFNETWORK_STORAGE_PARTITIONING)
+#if ENABLE(RESOURCE_LOAD_STATISTICS)
void WebPageProxy::hasStorageAccess(String&& subFrameHost, String&& topFrameHost, uint64_t frameID, uint64_t webProcessContextId)
{
m_websiteDataStore->hasStorageAccess(WTFMove(subFrameHost), WTFMove(topFrameHost), frameID, m_pageID, [this, webProcessContextId] (bool hasAccess) {
Modified: trunk/Source/WebKit/UIProcess/WebPageProxy.h (236484 => 236485)
--- trunk/Source/WebKit/UIProcess/WebPageProxy.h 2018-09-25 22:49:34 UTC (rev 236484)
+++ trunk/Source/WebKit/UIProcess/WebPageProxy.h 2018-09-25 22:49:47 UTC (rev 236485)
@@ -1323,7 +1323,7 @@
void touchBarMenuItemDataRemoved(const TouchBarMenuItemData&);
#endif
-#if HAVE(CFNETWORK_STORAGE_PARTITIONING)
+#if ENABLE(RESOURCE_LOAD_STATISTICS)
void hasStorageAccess(String&& subFrameHost, String&& topFrameHost, uint64_t frameID, uint64_t webProcessContextId);
void requestStorageAccess(String&& subFrameHost, String&& topFrameHost, uint64_t frameID, uint64_t webProcessContextId, bool prompt);
#endif
Modified: trunk/Source/WebKit/UIProcess/WebPageProxy.messages.in (236484 => 236485)
--- trunk/Source/WebKit/UIProcess/WebPageProxy.messages.in 2018-09-25 22:49:34 UTC (rev 236484)
+++ trunk/Source/WebKit/UIProcess/WebPageProxy.messages.in 2018-09-25 22:49:47 UTC (rev 236485)
@@ -526,7 +526,7 @@
StopURLSchemeTask(uint64_t handlerIdentifier, uint64_t taskIdentifier)
LoadSynchronousURLSchemeTask(struct WebKit::URLSchemeTaskParameters parameters) -> (WebCore::ResourceResponse response, WebCore::ResourceError error, IPC::DataReference data) Delayed
-#if HAVE(CFNETWORK_STORAGE_PARTITIONING)
+#if ENABLE(RESOURCE_LOAD_STATISTICS)
HasStorageAccess(String subFrameHost, String topFrameHost, uint64_t frameID, uint64_t contextID)
RequestStorageAccess(String subFrameHost, String topFrameHost, uint64_t frameID, uint64_t contextID, bool prompt)
#endif
Modified: trunk/Source/WebKit/UIProcess/WebResourceLoadStatisticsStore.cpp (236484 => 236485)
--- trunk/Source/WebKit/UIProcess/WebResourceLoadStatisticsStore.cpp 2018-09-25 22:49:34 UTC (rev 236484)
+++ trunk/Source/WebKit/UIProcess/WebResourceLoadStatisticsStore.cpp 2018-09-25 22:49:47 UTC (rev 236485)
@@ -239,7 +239,7 @@
{
ASSERT(RunLoop::isMain());
-#if HAVE(CFNETWORK_STORAGE_PARTITIONING)
+#if ENABLE(RESOURCE_LOAD_STATISTICS)
if (m_websiteDataStore) {
m_websiteDataStore->hasStorageAccessForFrameHandler(resourceDomain, firstPartyDomain, frameID, pageID, WTFMove(callback));
return;
@@ -312,7 +312,7 @@
{
ASSERT(RunLoop::isMain());
-#if HAVE(CFNETWORK_STORAGE_PARTITIONING)
+#if ENABLE(RESOURCE_LOAD_STATISTICS)
if (m_websiteDataStore) {
m_websiteDataStore->grantStorageAccessHandler(subFramePrimaryDomain, topFramePrimaryDomain, frameID, pageID, WTFMove(callback));
return;
@@ -325,7 +325,7 @@
{
ASSERT(RunLoop::isMain());
-#if HAVE(CFNETWORK_STORAGE_PARTITIONING)
+#if ENABLE(RESOURCE_LOAD_STATISTICS)
if (m_websiteDataStore)
m_websiteDataStore->removeAllStorageAccessHandler(WTFMove(completionHandler));
else
@@ -748,7 +748,7 @@
});
}
-#if HAVE(CFNETWORK_STORAGE_PARTITIONING)
+#if ENABLE(RESOURCE_LOAD_STATISTICS)
void WebResourceLoadStatisticsStore::scheduleCookieBlockingStateReset()
{
ASSERT(RunLoop::isMain());
@@ -827,7 +827,7 @@
ASSERT(RunLoop::isMain());
ASSERT(seconds >= 0_s);
-#if HAVE(CFNETWORK_STORAGE_PARTITIONING)
+#if ENABLE(RESOURCE_LOAD_STATISTICS)
if (m_websiteDataStore) {
m_websiteDataStore->setCacheMaxAgeCapForPrevalentResources(seconds, WTFMove(completionHandler));
return;
@@ -840,7 +840,7 @@
{
ASSERT(RunLoop::isMain());
-#if HAVE(CFNETWORK_STORAGE_PARTITIONING)
+#if ENABLE(RESOURCE_LOAD_STATISTICS)
if (m_websiteDataStore) {
m_websiteDataStore->updatePrevalentDomainsToBlockCookiesFor(domainsToBlock, shouldClearFirst, WTFMove(completionHandler));
return;
@@ -853,7 +853,7 @@
{
ASSERT(RunLoop::isMain());
-#if HAVE(CFNETWORK_STORAGE_PARTITIONING)
+#if ENABLE(RESOURCE_LOAD_STATISTICS)
if (m_websiteDataStore)
m_websiteDataStore->removePrevalentDomains(domains);
#endif
Modified: trunk/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.cpp (236484 => 236485)
--- trunk/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.cpp 2018-09-25 22:49:34 UTC (rev 236484)
+++ trunk/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.cpp 2018-09-25 22:49:47 UTC (rev 236485)
@@ -1227,7 +1227,7 @@
});
}
-#if HAVE(CFNETWORK_STORAGE_PARTITIONING)
+#if ENABLE(RESOURCE_LOAD_STATISTICS)
void WebsiteDataStore::updatePrevalentDomainsToBlockCookiesFor(const Vector<String>& domainsToBlock, ShouldClearFirst shouldClearFirst, CompletionHandler<void()>&& completionHandler)
{
auto callbackAggregator = CallbackAggregator::create(WTFMove(completionHandler));
@@ -1323,7 +1323,7 @@
void WebsiteDataStore::setCacheMaxAgeCapForPrevalentResources(Seconds seconds, CompletionHandler<void()>&& completionHandler)
{
-#if HAVE(CFNETWORK_STORAGE_PARTITIONING)
+#if ENABLE(RESOURCE_LOAD_STATISTICS)
auto callbackAggregator = CallbackAggregator::create(WTFMove(completionHandler));
for (auto& processPool : processPools()) {
@@ -1338,7 +1338,7 @@
void WebsiteDataStore::resetCacheMaxAgeCapForPrevalentResources(CompletionHandler<void()>&& completionHandler)
{
-#if HAVE(CFNETWORK_STORAGE_PARTITIONING)
+#if ENABLE(RESOURCE_LOAD_STATISTICS)
auto callbackAggregator = CallbackAggregator::create(WTFMove(completionHandler));
for (auto& processPool : processPools()) {
@@ -1352,7 +1352,7 @@
void WebsiteDataStore::networkProcessDidCrash()
{
-#if HAVE(CFNETWORK_STORAGE_PARTITIONING)
+#if ENABLE(RESOURCE_LOAD_STATISTICS)
if (m_resourceLoadStatistics)
m_resourceLoadStatistics->scheduleCookieBlockingStateReset();
#endif
Modified: trunk/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.h (236484 => 236485)
--- trunk/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.h 2018-09-25 22:49:34 UTC (rev 236484)
+++ trunk/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.h 2018-09-25 22:49:47 UTC (rev 236485)
@@ -65,7 +65,7 @@
struct WebsiteDataRecord;
struct WebsiteDataStoreParameters;
-#if HAVE(CFNETWORK_STORAGE_PARTITIONING)
+#if ENABLE(RESOURCE_LOAD_STATISTICS)
enum class StorageAccessStatus;
enum class StorageAccessPromptStatus;
#endif
@@ -135,7 +135,7 @@
void removeData(OptionSet<WebsiteDataType>, const Vector<WebsiteDataRecord>&, Function<void()>&& completionHandler);
void removeDataForTopPrivatelyControlledDomains(OptionSet<WebsiteDataType>, OptionSet<WebsiteDataFetchOption>, const Vector<String>& topPrivatelyControlledDomains, Function<void(HashSet<String>&&)>&& completionHandler);
-#if HAVE(CFNETWORK_STORAGE_PARTITIONING)
+#if ENABLE(RESOURCE_LOAD_STATISTICS)
void updatePrevalentDomainsToBlockCookiesFor(const Vector<String>& domainsToBlock, ShouldClearFirst, CompletionHandler<void()>&&);
void hasStorageAccessForFrameHandler(const String& resourceDomain, const String& firstPartyDomain, uint64_t frameID, uint64_t pageID, CompletionHandler<void(bool hasAccess)>&&);
void getAllStorageAccessEntries(uint64_t pageID, CompletionHandler<void(Vector<String>&& domains)>&&);
Modified: trunk/Source/WebKit/WebProcess/WebCoreSupport/WebChromeClient.cpp (236484 => 236485)
--- trunk/Source/WebKit/WebProcess/WebCoreSupport/WebChromeClient.cpp 2018-09-25 22:49:34 UTC (rev 236484)
+++ trunk/Source/WebKit/WebProcess/WebCoreSupport/WebChromeClient.cpp 2018-09-25 22:49:47 UTC (rev 236485)
@@ -1305,7 +1305,7 @@
m_page.findController().didInvalidateDocumentMarkerRects();
}
-#if HAVE(CFNETWORK_STORAGE_PARTITIONING)
+#if ENABLE(RESOURCE_LOAD_STATISTICS)
void WebChromeClient::hasStorageAccess(String&& subFrameHost, String&& topFrameHost, uint64_t frameID, uint64_t, CompletionHandler<void(bool)>&& callback)
{
m_page.hasStorageAccess(WTFMove(subFrameHost), WTFMove(topFrameHost), frameID, WTFMove(callback));
Modified: trunk/Source/WebKit/WebProcess/WebCoreSupport/WebChromeClient.h (236484 => 236485)
--- trunk/Source/WebKit/WebProcess/WebCoreSupport/WebChromeClient.h 2018-09-25 22:49:34 UTC (rev 236484)
+++ trunk/Source/WebKit/WebProcess/WebCoreSupport/WebChromeClient.h 2018-09-25 22:49:47 UTC (rev 236485)
@@ -363,7 +363,7 @@
void didInvalidateDocumentMarkerRects() final;
-#if HAVE(CFNETWORK_STORAGE_PARTITIONING)
+#if ENABLE(RESOURCE_LOAD_STATISTICS)
void hasStorageAccess(String&& subFrameHost, String&& topFrameHost, uint64_t frameID, uint64_t pageID, WTF::CompletionHandler<void (bool)>&&) final;
void requestStorageAccess(String&& subFrameHost, String&& topFrameHost, uint64_t frameID, uint64_t pageID, WTF::CompletionHandler<void (bool)>&&) final;
#endif
Modified: trunk/Source/WebKit/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp (236484 => 236485)
--- trunk/Source/WebKit/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp 2018-09-25 22:49:34 UTC (rev 236484)
+++ trunk/Source/WebKit/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp 2018-09-25 22:49:47 UTC (rev 236485)
@@ -171,7 +171,7 @@
if (!webPage)
return;
-#if HAVE(CFNETWORK_STORAGE_PARTITIONING)
+#if ENABLE(RESOURCE_LOAD_STATISTICS)
if (m_hasFrameSpecificStorageAccess) {
WebProcess::singleton().ensureNetworkProcessConnection().connection().send(Messages::NetworkConnectionToWebProcess::RemoveStorageAccessForFrame(sessionID(), frameID().value(), pageID().value()), 0);
m_hasFrameSpecificStorageAccess = false;
@@ -386,7 +386,7 @@
void WebFrameLoaderClient::dispatchWillChangeDocument(const URL& currentUrl, const URL& newUrl)
{
-#if HAVE(CFNETWORK_STORAGE_PARTITIONING)
+#if ENABLE(RESOURCE_LOAD_STATISTICS)
if (m_frame->isMainFrame())
return;
Modified: trunk/Source/WebKit/WebProcess/WebCoreSupport/WebFrameLoaderClient.h (236484 => 236485)
--- trunk/Source/WebKit/WebProcess/WebCoreSupport/WebFrameLoaderClient.h 2018-09-25 22:49:34 UTC (rev 236484)
+++ trunk/Source/WebKit/WebProcess/WebCoreSupport/WebFrameLoaderClient.h 2018-09-25 22:49:47 UTC (rev 236485)
@@ -55,7 +55,7 @@
std::optional<uint64_t> frameID() const final;
PAL::SessionID sessionID() const final;
-#if HAVE(CFNETWORK_STORAGE_PARTITIONING)
+#if ENABLE(RESOURCE_LOAD_STATISTICS)
bool hasFrameSpecificStorageAccess() { return m_hasFrameSpecificStorageAccess; }
void setHasFrameSpecificStorageAccess(bool value) { m_hasFrameSpecificStorageAccess = value; };
#endif
@@ -283,7 +283,7 @@
bool m_frameHasCustomContentProvider;
bool m_frameCameFromPageCache;
bool m_useIconLoadingClient { false };
-#if HAVE(CFNETWORK_STORAGE_PARTITIONING)
+#if ENABLE(RESOURCE_LOAD_STATISTICS)
bool m_hasFrameSpecificStorageAccess { false };
#endif
};
Modified: trunk/Source/WebKit/WebProcess/WebPage/WebPage.cpp (236484 => 236485)
--- trunk/Source/WebKit/WebProcess/WebPage/WebPage.cpp 2018-09-25 22:49:34 UTC (rev 236484)
+++ trunk/Source/WebKit/WebProcess/WebPage/WebPage.cpp 2018-09-25 22:49:47 UTC (rev 236485)
@@ -6049,7 +6049,7 @@
close();
}
-#if HAVE(CFNETWORK_STORAGE_PARTITIONING)
+#if ENABLE(RESOURCE_LOAD_STATISTICS)
static uint64_t nextRequestStorageAccessContextId()
{
static uint64_t nextContextId = 0;
Modified: trunk/Source/WebKit/WebProcess/WebPage/WebPage.h (236484 => 236485)
--- trunk/Source/WebKit/WebProcess/WebPage/WebPage.h 2018-09-25 22:49:34 UTC (rev 236484)
+++ trunk/Source/WebKit/WebProcess/WebPage/WebPage.h 2018-09-25 22:49:47 UTC (rev 236485)
@@ -1069,7 +1069,7 @@
void sendPartialEditorStateAndSchedulePostLayoutUpdate();
void flushPendingEditorStateUpdate();
-#if HAVE(CFNETWORK_STORAGE_PARTITIONING)
+#if ENABLE(RESOURCE_LOAD_STATISTICS)
void hasStorageAccess(String&& subFrameHost, String&& topFrameHost, uint64_t frameID, CompletionHandler<void(bool)>&& callback);
void requestStorageAccess(String&& subFrameHost, String&& topFrameHost, uint64_t frameID, CompletionHandler<void(bool)>&& callback);
void storageAccessResponse(bool wasGranted, uint64_t contextId);
Modified: trunk/Source/WebKit/WebProcess/WebPage/WebPage.messages.in (236484 => 236485)
--- trunk/Source/WebKit/WebProcess/WebPage/WebPage.messages.in 2018-09-25 22:49:34 UTC (rev 236484)
+++ trunk/Source/WebKit/WebProcess/WebPage/WebPage.messages.in 2018-09-25 22:49:47 UTC (rev 236485)
@@ -508,7 +508,7 @@
SetIsSuspended(bool suspended)
TearDownDrawingAreaForSuspend();
-#if HAVE(CFNETWORK_STORAGE_PARTITIONING)
+#if ENABLE(RESOURCE_LOAD_STATISTICS)
StorageAccessResponse(bool wasGranted, uint64_t contextId)
#endif
Modified: trunk/Source/WebKit/WebProcess/WebProcess.cpp (236484 => 236485)
--- trunk/Source/WebKit/WebProcess/WebProcess.cpp 2018-09-25 22:49:34 UTC (rev 236484)
+++ trunk/Source/WebKit/WebProcess/WebProcess.cpp 2018-09-25 22:49:47 UTC (rev 236485)
@@ -415,7 +415,7 @@
JSC::Wasm::enableFastMemory();
#endif
-#if HAVE(CFNETWORK_STORAGE_PARTITIONING) && !RELEASE_LOG_DISABLED
+#if ENABLE(RESOURCE_LOAD_STATISTICS) && !RELEASE_LOG_DISABLED
ResourceLoadObserver::shared().setShouldLogUserInteraction(parameters.shouldLogUserInteraction);
#endif
