Attachment 362051 Details for Bug 194664 – Patch

[patch] Patch

bug-194664-20190214125615.patch (text/plain), 30.57 KB, created by Brent Fulgham on 2019-02-14 12:56:16 PST

(hide)

Description:

Filename:

MIME Type:

Creator: Brent Fulgham

Created: 2019-02-14 12:56:16 PST

Size: 30.57 KB

patch

obsolete

>Subversion Revision: 241468
>diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
>index 4b97c0ff8b8730e9f207b7f7eaf1cfb25d422a51..4b3342fde03046059bc6d4e27e694ea33582f84e 100644
>--- a/Source/WebKit/ChangeLog
>+++ b/Source/WebKit/ChangeLog
>@@ -1,3 +1,61 @@
>+2019-02-14  Brent Fulgham  <bfulgham@apple.com>
>+
>+        REGRESSION (r240446): Storage Access API does not handle domains consistently
>+        https://bugs.webkit.org/show_bug.cgi?id=194664
>+
>+        Reviewed by NOBODY (OOPS!).
>+        
>+        During my refactoring of the ResourceLoadStatistics code, I introduced two bugs:
>+        (1) I neglected to be consistent in my use of 'primaryDomain', causing some Storage
>+        Access API code paths to store approves under one domain (e.g., 'www.example.com'),
>+        while checking status under the eTLD+1 (e.g., 'example.com'). The exact string matching
>+        requirement caused these to get missed.
>+
>+        (2) I used a move operator before a final set of copies of domain names, leading to
>+        some empty strings being passed to Storage Access API calls.
>+
>+        Both issues are corrected in this patch.
>+
>+        * NetworkProcess/Classifier/WebResourceLoadStatisticsStore.cpp:
>+        (WebKit::WebResourceLoadStatisticsStore::setPrevalentResourceForDebugMode): Always make the
>+        domain comply with our 'primaryDomain' logic.
>+        (WebKit::WebResourceLoadStatisticsStore::hasStorageAccess): Ditto.
>+        (WebKit::WebResourceLoadStatisticsStore::requestStorageAccessGranted): Ditto.
>+        (WebKit::WebResourceLoadStatisticsStore::logFrameNavigation): Ditto.
>+        (WebKit::WebResourceLoadStatisticsStore::logWebSocketLoading): Ditto.
>+        (WebKit::WebResourceLoadStatisticsStore::logSubresourceLoading): Ditto.
>+        (WebKit::WebResourceLoadStatisticsStore::logSubresourceRedirect): Ditto.
>+        (WebKit::WebResourceLoadStatisticsStore::logUserInteraction): Ditto.
>+        (WebKit::WebResourceLoadStatisticsStore::clearUserInteraction): Ditto.
>+        (WebKit::WebResourceLoadStatisticsStore::hasHadUserInteraction): Ditto.
>+        (WebKit::WebResourceLoadStatisticsStore::setLastSeen): Ditto.
>+        (WebKit::WebResourceLoadStatisticsStore::setPrevalentResource): Ditto.
>+        (WebKit::WebResourceLoadStatisticsStore::setVeryPrevalentResource): Ditto.
>+        (WebKit::WebResourceLoadStatisticsStore::isPrevalentResource): Ditto.
>+        (WebKit::WebResourceLoadStatisticsStore::isVeryPrevalentResource): Ditto.
>+        (WebKit::WebResourceLoadStatisticsStore::isRegisteredAsSubresourceUnder): Ditto.
>+        (WebKit::WebResourceLoadStatisticsStore::isRegisteredAsSubFrameUnder): Ditto.
>+        (WebKit::WebResourceLoadStatisticsStore::isRegisteredAsRedirectingTo): Ditto.
>+        (WebKit::WebResourceLoadStatisticsStore::clearPrevalentResource): Ditto.
>+        (WebKit::WebResourceLoadStatisticsStore::setGrandfathered): Ditto.
>+        (WebKit::WebResourceLoadStatisticsStore::isGrandfathered): Ditto.
>+        (WebKit::WebResourceLoadStatisticsStore::setSubframeUnderTopFrameOrigin): Ditto.
>+        (WebKit::WebResourceLoadStatisticsStore::setSubresourceUnderTopFrameOrigin): Ditto.
>+        (WebKit::WebResourceLoadStatisticsStore::setSubresourceUniqueRedirectTo): Ditto.
>+        (WebKit::WebResourceLoadStatisticsStore::setSubresourceUniqueRedirectFrom): Ditto.
>+        (WebKit::WebResourceLoadStatisticsStore::setTopFrameUniqueRedirectTo): Ditto.
>+        (WebKit::WebResourceLoadStatisticsStore::setTopFrameUniqueRedirectFrom): Ditto.
>+        * UIProcess/WebsiteData/WebsiteDataStore.cpp:
>+        (WebKit::WebsiteDataStore::hasStorageAccess): Always make the
>+        domain comply with our 'primaryDomain' logic.
>+        (WebKit::WebsiteDataStore::requestStorageAccess): Ditto. Also make copy of domain
>+        names before moving them to the completion handler.
>+        (WebKit::WebsiteDataStore::grantStorageAccess): Ditto.
>+        * WebProcess/WebPage/WebPage.cpp:
>+        (WebKit::WebPage::hasStorageAccess):  Always make the domain comply with our
>+        'primaryDomain' logic.
>+        (WebKit::WebPage::requestStorageAccess): Ditto.
>+
> 2019-02-13  Michael Catanzaro  <mcatanzaro@igalia.com>
> 
>         Fix -Wformat warning from r241401
>diff --git a/Source/WebKit/NetworkProcess/Classifier/WebResourceLoadStatisticsStore.cpp b/Source/WebKit/NetworkProcess/Classifier/WebResourceLoadStatisticsStore.cpp
>index 6f9ef7db6eb3d76318b7c5a52c07e1a28ae482e5..e0dac21d67967d74dc5a3a9f448674b83ac955ea 100644
>--- a/Source/WebKit/NetworkProcess/Classifier/WebResourceLoadStatisticsStore.cpp
>+++ b/Source/WebKit/NetworkProcess/Classifier/WebResourceLoadStatisticsStore.cpp
>@@ -211,7 +211,7 @@ void WebResourceLoadStatisticsStore::setPrevalentResourceForDebugMode(const Stri
> {
>     ASSERT(RunLoop::isMain());
>     
>-    postTask([this, primaryDomain = primaryDomain.isolatedCopy(), completionHandler = WTFMove(completionHandler)]() mutable {
>+    postTask([this, primaryDomain = isolatedPrimaryDomain(primaryDomain), completionHandler = WTFMove(completionHandler)]() mutable {
>         if (m_memoryStore)
>             m_memoryStore->setPrevalentResourceForDebugMode(primaryDomain);
>         postTaskReply(WTFMove(completionHandler));
>@@ -261,7 +261,7 @@ void WebResourceLoadStatisticsStore::hasStorageAccess(const String& subFrameHost
>     ASSERT(subFrameHost != topFrameHost);
>     ASSERT(RunLoop::isMain());
> 
>-    postTask([this, subFramePrimaryDomain = subFrameHost.isolatedCopy(), topFramePrimaryDomain = topFrameHost.isolatedCopy(), frameID, pageID, completionHandler = WTFMove(completionHandler)]() mutable {
>+    postTask([this, subFramePrimaryDomain = isolatedPrimaryDomain(subFrameHost), topFramePrimaryDomain = isolatedPrimaryDomain(topFrameHost), frameID, pageID, completionHandler = WTFMove(completionHandler)]() mutable {
>         if (!m_memoryStore) {
>             postTaskReply([completionHandler = WTFMove(completionHandler)]() mutable {
>                 completionHandler(false);
>@@ -295,7 +295,7 @@ void WebResourceLoadStatisticsStore::callHasStorageAccessForFrameHandler(const S
> 
> void WebResourceLoadStatisticsStore::requestStorageAccessGranted(const String& subFrameHost, const String& topFrameHost, uint64_t frameID, uint64_t pageID, bool promptEnabled, CompletionHandler<void(bool)>&& completionHandler)
> {
>-    auto statusHandler = [this, protectedThis = makeRef(*this), subFrameHost = subFrameHost.isolatedCopy(), topFrameHost = topFrameHost.isolatedCopy(), promptEnabled, frameID, pageID, completionHandler = WTFMove(completionHandler)](StorageAccessStatus status) mutable {
>+    auto statusHandler = [this, protectedThis = makeRef(*this), subFrameHost = isolatedPrimaryDomain(subFrameHost), topFrameHost = isolatedPrimaryDomain(topFrameHost), promptEnabled, frameID, pageID, completionHandler = WTFMove(completionHandler)](StorageAccessStatus status) mutable {
>         switch (status) {
>         case StorageAccessStatus::CannotRequestAccess:
>             completionHandler(false);
>@@ -303,13 +303,15 @@ void WebResourceLoadStatisticsStore::requestStorageAccessGranted(const String& s
>         case StorageAccessStatus::RequiresUserPrompt:
>             {
>             ASSERT_UNUSED(promptEnabled, promptEnabled);
>+            auto subFramePrimaryDomain = ResourceLoadStatistics::primaryDomain(subFrameHost);
>+            auto topFramePrimaryDomain = ResourceLoadStatistics::primaryDomain(topFrameHost);
>             CompletionHandler<void(bool)> requestConfirmationCompletionHandler = [this, protectedThis = makeRef(*this), subFrameHost = WTFMove(subFrameHost), topFrameHost = WTFMove(topFrameHost), frameID, pageID, completionHandler = WTFMove(completionHandler)] (bool userDidGrantAccess) mutable {
>                 if (userDidGrantAccess)
>                     grantStorageAccess(WTFMove(subFrameHost), WTFMove(topFrameHost), frameID, pageID, userDidGrantAccess, WTFMove(completionHandler));
>                 else
>                     completionHandler(false);
>             };
>-            m_networkSession->networkProcess().parentProcessConnection()->sendWithAsyncReply(Messages::NetworkProcessProxy::RequestStorageAccessConfirm(pageID, frameID, ResourceLoadStatistics::primaryDomain(subFrameHost), ResourceLoadStatistics::primaryDomain(topFrameHost)), WTFMove(requestConfirmationCompletionHandler));
>+            m_networkSession->networkProcess().parentProcessConnection()->sendWithAsyncReply(Messages::NetworkProcessProxy::RequestStorageAccessConfirm(pageID, frameID, subFramePrimaryDomain, topFramePrimaryDomain), WTFMove(requestConfirmationCompletionHandler));
>             }
>             return;
>         case StorageAccessStatus::HasAccess:
>@@ -481,7 +483,7 @@ void WebResourceLoadStatisticsStore::logFrameNavigation(const WebFrameProxy& fra
> 
> void WebResourceLoadStatisticsStore::logFrameNavigation(const String& targetPrimaryDomain, const String& mainFramePrimaryDomain, const String& sourcePrimaryDomain, const String& targetHost, const String& mainFrameHost, bool isRedirect, bool isMainFrame)
> {
>-    postTask([this, targetPrimaryDomain = targetPrimaryDomain.isolatedCopy(), mainFramePrimaryDomain = mainFramePrimaryDomain.isolatedCopy(), sourcePrimaryDomain = sourcePrimaryDomain.isolatedCopy(), targetHost = targetHost.isolatedCopy(), mainFrameHost = mainFrameHost.isolatedCopy(), isRedirect, isMainFrame] {
>+    postTask([this, targetPrimaryDomain = isolatedPrimaryDomain(targetPrimaryDomain), mainFramePrimaryDomain = isolatedPrimaryDomain(mainFramePrimaryDomain), sourcePrimaryDomain = isolatedPrimaryDomain(sourcePrimaryDomain), targetHost = isolatedPrimaryDomain(targetHost), mainFrameHost = isolatedPrimaryDomain(mainFrameHost), isRedirect, isMainFrame] {
>         
>         if (m_memoryStore)
>             m_memoryStore->logFrameNavigation(targetPrimaryDomain, mainFramePrimaryDomain, sourcePrimaryDomain, targetHost, mainFrameHost, isRedirect, isMainFrame);
>@@ -490,7 +492,7 @@ void WebResourceLoadStatisticsStore::logFrameNavigation(const String& targetPrim
> 
> void WebResourceLoadStatisticsStore::logWebSocketLoading(const String& targetPrimaryDomain, const String& mainFramePrimaryDomain, WallTime lastSeen, CompletionHandler<void()>&& completionHandler)
> {
>-    postTask([this, targetPrimaryDomain = targetPrimaryDomain.isolatedCopy(), mainFramePrimaryDomain = mainFramePrimaryDomain.isolatedCopy(), lastSeen, completionHandler = WTFMove(completionHandler)]() mutable {
>+    postTask([this, targetPrimaryDomain = isolatedPrimaryDomain(targetPrimaryDomain), mainFramePrimaryDomain = isolatedPrimaryDomain(mainFramePrimaryDomain), lastSeen, completionHandler = WTFMove(completionHandler)]() mutable {
>         if (m_memoryStore)
>             m_memoryStore->logSubresourceLoading(targetPrimaryDomain, mainFramePrimaryDomain, lastSeen);
> 
>@@ -500,7 +502,7 @@ void WebResourceLoadStatisticsStore::logWebSocketLoading(const String& targetPri
> 
> void WebResourceLoadStatisticsStore::logSubresourceLoading(const String& targetPrimaryDomain, const String& mainFramePrimaryDomain, WallTime lastSeen, CompletionHandler<void()>&& completionHandler)
> {
>-    postTask([this, targetPrimaryDomain = targetPrimaryDomain.isolatedCopy(), mainFramePrimaryDomain = mainFramePrimaryDomain.isolatedCopy(), lastSeen, completionHandler = WTFMove(completionHandler)]() mutable {
>+    postTask([this, targetPrimaryDomain = isolatedPrimaryDomain(targetPrimaryDomain), mainFramePrimaryDomain = isolatedPrimaryDomain(mainFramePrimaryDomain), lastSeen, completionHandler = WTFMove(completionHandler)]() mutable {
>         if (m_memoryStore)
>             m_memoryStore->logSubresourceLoading(targetPrimaryDomain, mainFramePrimaryDomain, lastSeen);
>         
>@@ -510,7 +512,7 @@ void WebResourceLoadStatisticsStore::logSubresourceLoading(const String& targetP
> 
> void WebResourceLoadStatisticsStore::logSubresourceRedirect(const String& sourcePrimaryDomain, const String& targetPrimaryDomain, CompletionHandler<void()>&& completionHandler)
> {
>-    postTask([this, sourcePrimaryDomain = sourcePrimaryDomain.isolatedCopy(), targetPrimaryDomain = targetPrimaryDomain.isolatedCopy(), completionHandler = WTFMove(completionHandler)]() mutable {
>+    postTask([this, sourcePrimaryDomain = isolatedPrimaryDomain(sourcePrimaryDomain), targetPrimaryDomain = isolatedPrimaryDomain(targetPrimaryDomain), completionHandler = WTFMove(completionHandler)]() mutable {
>         if (m_memoryStore)
>             m_memoryStore->logSubresourceRedirect(sourcePrimaryDomain, targetPrimaryDomain);
>         
>@@ -522,7 +524,7 @@ void WebResourceLoadStatisticsStore::logUserInteraction(const String& targetPrim
> {
>     ASSERT(RunLoop::isMain());
> 
>-    postTask([this, primaryDomain = targetPrimaryDomain.isolatedCopy(), completionHandler = WTFMove(completionHandler)]() mutable {
>+    postTask([this, primaryDomain = isolatedPrimaryDomain(targetPrimaryDomain), completionHandler = WTFMove(completionHandler)]() mutable {
>         if (m_memoryStore)
>             m_memoryStore->logUserInteraction(primaryDomain);
>         postTaskReply(WTFMove(completionHandler));
>@@ -533,7 +535,7 @@ void WebResourceLoadStatisticsStore::clearUserInteraction(const String& targetPr
> {
>     ASSERT(RunLoop::isMain());
>     
>-    postTask([this, primaryDomain = targetPrimaryDomain.isolatedCopy(), completionHandler = WTFMove(completionHandler)]() mutable {
>+    postTask([this, primaryDomain = isolatedPrimaryDomain(targetPrimaryDomain), completionHandler = WTFMove(completionHandler)]() mutable {
>         if (m_memoryStore)
>             m_memoryStore->clearUserInteraction(primaryDomain);
>         postTaskReply(WTFMove(completionHandler));
>@@ -542,7 +544,7 @@ void WebResourceLoadStatisticsStore::clearUserInteraction(const String& targetPr
> 
> void WebResourceLoadStatisticsStore::hasHadUserInteraction(const String& primaryDomain, CompletionHandler<void(bool)>&& completionHandler)
> {
>-    postTask([this, primaryDomain = primaryDomain.isolatedCopy(), completionHandler = WTFMove(completionHandler)]() mutable {
>+    postTask([this, primaryDomain = isolatedPrimaryDomain(primaryDomain), completionHandler = WTFMove(completionHandler)]() mutable {
>         bool hadUserInteraction = m_memoryStore ? m_memoryStore->hasHadUserInteraction(primaryDomain) : false;
>         postTaskReply([hadUserInteraction, completionHandler = WTFMove(completionHandler)]() mutable {
>             completionHandler(hadUserInteraction);
>@@ -554,7 +556,7 @@ void WebResourceLoadStatisticsStore::setLastSeen(const String& resourceDomain, S
> {
>     ASSERT(RunLoop::isMain());
>     
>-    postTask([this, resourceDomain = resourceDomain.isolatedCopy(), seconds, completionHandler = WTFMove(completionHandler)]() mutable {
>+    postTask([this, resourceDomain = isolatedPrimaryDomain(resourceDomain), seconds, completionHandler = WTFMove(completionHandler)]() mutable {
>         if (m_memoryStore)
>             m_memoryStore->setLastSeen(resourceDomain, seconds);
>         postTaskReply(WTFMove(completionHandler));
>@@ -565,7 +567,7 @@ void WebResourceLoadStatisticsStore::setPrevalentResource(const String& resource
> {
>     ASSERT(RunLoop::isMain());
> 
>-    postTask([this, resourceDomain = resourceDomain.isolatedCopy(), completionHandler = WTFMove(completionHandler)]() mutable {
>+    postTask([this, resourceDomain = isolatedPrimaryDomain(resourceDomain), completionHandler = WTFMove(completionHandler)]() mutable {
>         if (m_memoryStore)
>             m_memoryStore->setPrevalentResource(resourceDomain);
>         postTaskReply(WTFMove(completionHandler));
>@@ -576,7 +578,7 @@ void WebResourceLoadStatisticsStore::setVeryPrevalentResource(const String& prim
> {
>     ASSERT(RunLoop::isMain());
> 
>-    postTask([this, primaryDomain = primaryDomain.isolatedCopy(), completionHandler = WTFMove(completionHandler)]() mutable {
>+    postTask([this, primaryDomain = isolatedPrimaryDomain(primaryDomain), completionHandler = WTFMove(completionHandler)]() mutable {
>         if (m_memoryStore)
>             m_memoryStore->setVeryPrevalentResource(primaryDomain);
>         postTaskReply(WTFMove(completionHandler));
>@@ -599,7 +601,7 @@ void WebResourceLoadStatisticsStore::isPrevalentResource(const String& primaryDo
> {
>     ASSERT(RunLoop::isMain());
>     
>-    postTask([this, primaryDomain = primaryDomain.isolatedCopy(), completionHandler = WTFMove(completionHandler)]() mutable {
>+    postTask([this, primaryDomain = isolatedPrimaryDomain(primaryDomain), completionHandler = WTFMove(completionHandler)]() mutable {
>         bool isPrevalentResource = m_memoryStore ? m_memoryStore->isPrevalentResource(primaryDomain) : false;
>         postTaskReply([isPrevalentResource, completionHandler = WTFMove(completionHandler)]() mutable {
>             completionHandler(isPrevalentResource);
>@@ -611,7 +613,7 @@ void WebResourceLoadStatisticsStore::isVeryPrevalentResource(const String& prima
> {
>     ASSERT(RunLoop::isMain());
>     
>-    postTask([this, primaryDomain = primaryDomain.isolatedCopy(), completionHandler = WTFMove(completionHandler)]() mutable {
>+    postTask([this, primaryDomain = isolatedPrimaryDomain(primaryDomain), completionHandler = WTFMove(completionHandler)]() mutable {
>         bool isVeryPrevalentResource = m_memoryStore ? m_memoryStore->isVeryPrevalentResource(primaryDomain) : false;
>         postTaskReply([isVeryPrevalentResource, completionHandler = WTFMove(completionHandler)]() mutable {
>             completionHandler(isVeryPrevalentResource);
>@@ -623,7 +625,7 @@ void WebResourceLoadStatisticsStore::isRegisteredAsSubresourceUnder(const String
> {
>     ASSERT(RunLoop::isMain());
> 
>-    postTask([this, subresourcePrimaryDomain = subresource.isolatedCopy(), topFramePrimaryDomain = topFrame.isolatedCopy(), completionHandler = WTFMove(completionHandler)]() mutable {
>+    postTask([this, subresourcePrimaryDomain = isolatedPrimaryDomain(subresource), topFramePrimaryDomain = isolatedPrimaryDomain(topFrame), completionHandler = WTFMove(completionHandler)]() mutable {
>         bool isRegisteredAsSubresourceUnder = m_memoryStore ? m_memoryStore->isRegisteredAsSubresourceUnder(subresourcePrimaryDomain, topFramePrimaryDomain) : false;
>         postTaskReply([isRegisteredAsSubresourceUnder, completionHandler = WTFMove(completionHandler)]() mutable {
>             completionHandler(isRegisteredAsSubresourceUnder);
>@@ -635,7 +637,7 @@ void WebResourceLoadStatisticsStore::isRegisteredAsSubFrameUnder(const String& s
> {
>     ASSERT(RunLoop::isMain());
> 
>-    postTask([this, subFramePrimaryDomain = subFrame.isolatedCopy(), topFramePrimaryDomain = topFrame.isolatedCopy(), completionHandler = WTFMove(completionHandler)]() mutable {
>+    postTask([this, subFramePrimaryDomain = isolatedPrimaryDomain(subFrame), topFramePrimaryDomain = isolatedPrimaryDomain(topFrame), completionHandler = WTFMove(completionHandler)]() mutable {
>         bool isRegisteredAsSubFrameUnder = m_memoryStore ? m_memoryStore->isRegisteredAsSubFrameUnder(subFramePrimaryDomain, topFramePrimaryDomain) : false;
>         postTaskReply([isRegisteredAsSubFrameUnder, completionHandler = WTFMove(completionHandler)]() mutable {
>             completionHandler(isRegisteredAsSubFrameUnder);
>@@ -647,7 +649,7 @@ void WebResourceLoadStatisticsStore::isRegisteredAsRedirectingTo(const String& h
> {
>     ASSERT(RunLoop::isMain());
> 
>-    postTask([this, hostRedirectedFromPrimaryDomain = hostRedirectedFrom.isolatedCopy(), hostRedirectedToPrimaryDomain = hostRedirectedTo.isolatedCopy(), completionHandler = WTFMove(completionHandler)]() mutable {
>+    postTask([this, hostRedirectedFromPrimaryDomain = isolatedPrimaryDomain(hostRedirectedFrom), hostRedirectedToPrimaryDomain = isolatedPrimaryDomain(hostRedirectedTo), completionHandler = WTFMove(completionHandler)]() mutable {
>         bool isRegisteredAsRedirectingTo = m_memoryStore ? m_memoryStore->isRegisteredAsRedirectingTo(hostRedirectedFromPrimaryDomain, hostRedirectedToPrimaryDomain) : false;
>         postTaskReply([isRegisteredAsRedirectingTo, completionHandler = WTFMove(completionHandler)]() mutable {
>             completionHandler(isRegisteredAsRedirectingTo);
>@@ -659,7 +661,7 @@ void WebResourceLoadStatisticsStore::clearPrevalentResource(const String& resour
> {
>     ASSERT(RunLoop::isMain());
>     
>-    postTask([this, resourceDomain = resourceDomain.isolatedCopy(), completionHandler = WTFMove(completionHandler)]() mutable {
>+    postTask([this, resourceDomain = isolatedPrimaryDomain(resourceDomain), completionHandler = WTFMove(completionHandler)]() mutable {
>         if (m_memoryStore)
>             m_memoryStore->clearPrevalentResource(resourceDomain);
>         postTaskReply(WTFMove(completionHandler));
>@@ -670,7 +672,7 @@ void WebResourceLoadStatisticsStore::setGrandfathered(const String& domain, bool
> {
>     ASSERT(RunLoop::isMain());
> 
>-    postTask([this, primaryDomain = domain.isolatedCopy(), value, completionHandler = WTFMove(completionHandler)]() mutable {
>+    postTask([this, primaryDomain = isolatedPrimaryDomain(domain), value, completionHandler = WTFMove(completionHandler)]() mutable {
>         if (m_memoryStore)
>             m_memoryStore->setGrandfathered(primaryDomain, value);
>         postTaskReply(WTFMove(completionHandler));
>@@ -681,7 +683,7 @@ void WebResourceLoadStatisticsStore::isGrandfathered(const String& primaryDomain
> {
>     ASSERT(RunLoop::isMain());
> 
>-    postTask([this, completionHandler = WTFMove(completionHandler), primaryDomain = primaryDomain.isolatedCopy()]() mutable {
>+    postTask([this, completionHandler = WTFMove(completionHandler), primaryDomain = isolatedPrimaryDomain(primaryDomain)]() mutable {
>         bool isGrandFathered = m_memoryStore ? m_memoryStore->isGrandfathered(primaryDomain) : false;
>         postTaskReply([isGrandFathered, completionHandler = WTFMove(completionHandler)]() mutable {
>             completionHandler(isGrandFathered);
>@@ -693,7 +695,7 @@ void WebResourceLoadStatisticsStore::setSubframeUnderTopFrameOrigin(const String
> {
>     ASSERT(RunLoop::isMain());
>     
>-    postTask([this, completionHandler = WTFMove(completionHandler), primaryTopFrameDomain = topFrame.isolatedCopy(), primarySubFrameDomain = subframe.isolatedCopy()]() mutable {
>+    postTask([this, completionHandler = WTFMove(completionHandler), primaryTopFrameDomain = isolatedPrimaryDomain(topFrame), primarySubFrameDomain = isolatedPrimaryDomain(subframe)]() mutable {
>         if (m_memoryStore)
>             m_memoryStore->setSubframeUnderTopFrameOrigin(primarySubFrameDomain, primaryTopFrameDomain);
>         postTaskReply(WTFMove(completionHandler));
>@@ -704,7 +706,7 @@ void WebResourceLoadStatisticsStore::setSubresourceUnderTopFrameOrigin(const Str
> {
>     ASSERT(RunLoop::isMain());
>     
>-    postTask([this, completionHandler = WTFMove(completionHandler), primaryTopFrameDomain = topFrame.isolatedCopy(), primarySubresourceDomain = subresource.isolatedCopy()]() mutable {
>+    postTask([this, completionHandler = WTFMove(completionHandler), primaryTopFrameDomain = isolatedPrimaryDomain(topFrame), primarySubresourceDomain = isolatedPrimaryDomain(subresource)]() mutable {
>         if (m_memoryStore)
>             m_memoryStore->setSubresourceUnderTopFrameOrigin(primarySubresourceDomain, primaryTopFrameDomain);
>         postTaskReply(WTFMove(completionHandler));
>@@ -715,7 +717,7 @@ void WebResourceLoadStatisticsStore::setSubresourceUniqueRedirectTo(const String
> {
>     ASSERT(RunLoop::isMain());
>     
>-    postTask([this, completionHandler = WTFMove(completionHandler), primaryRedirectDomain = hostNameRedirectedTo.isolatedCopy(), primarySubresourceDomain = subresource.isolatedCopy()]() mutable {
>+    postTask([this, completionHandler = WTFMove(completionHandler), primaryRedirectDomain = isolatedPrimaryDomain(hostNameRedirectedTo), primarySubresourceDomain = isolatedPrimaryDomain(subresource)]() mutable {
>         if (m_memoryStore)
>             m_memoryStore->setSubresourceUniqueRedirectTo(primarySubresourceDomain, primaryRedirectDomain);
>         postTaskReply(WTFMove(completionHandler));
>@@ -726,7 +728,7 @@ void WebResourceLoadStatisticsStore::setSubresourceUniqueRedirectFrom(const Stri
> {
>     ASSERT(RunLoop::isMain());
>     
>-    postTask([this, completionHandler = WTFMove(completionHandler), primaryRedirectDomain = hostNameRedirectedFrom.isolatedCopy(), primarySubresourceDomain = subresource.isolatedCopy()]() mutable {
>+    postTask([this, completionHandler = WTFMove(completionHandler), primaryRedirectDomain = isolatedPrimaryDomain(hostNameRedirectedFrom), primarySubresourceDomain = isolatedPrimaryDomain(subresource)]() mutable {
>         if (m_memoryStore)
>             m_memoryStore->setSubresourceUniqueRedirectFrom(primarySubresourceDomain, primaryRedirectDomain);
>         postTaskReply(WTFMove(completionHandler));
>@@ -737,7 +739,7 @@ void WebResourceLoadStatisticsStore::setTopFrameUniqueRedirectTo(const String& t
> {
>     ASSERT(RunLoop::isMain());
>     
>-    postTask([this, completionHandler = WTFMove(completionHandler), topFramePrimaryDomain = topFrameHostName.isolatedCopy(), primaryRedirectDomain = hostNameRedirectedTo.isolatedCopy()]() mutable {
>+    postTask([this, completionHandler = WTFMove(completionHandler), topFramePrimaryDomain = isolatedPrimaryDomain(topFrameHostName), primaryRedirectDomain = isolatedPrimaryDomain(hostNameRedirectedTo)]() mutable {
>         if (m_memoryStore)
>             m_memoryStore->setTopFrameUniqueRedirectTo(topFramePrimaryDomain, primaryRedirectDomain);
>         postTaskReply(WTFMove(completionHandler));
>@@ -748,7 +750,7 @@ void WebResourceLoadStatisticsStore::setTopFrameUniqueRedirectFrom(const String&
> {
>     ASSERT(RunLoop::isMain());
>     
>-    postTask([this, completionHandler = WTFMove(completionHandler), topFramePrimaryDomain = topFrameHostName.isolatedCopy(), primaryRedirectDomain = hostNameRedirectedFrom.isolatedCopy()]() mutable {
>+    postTask([this, completionHandler = WTFMove(completionHandler), topFramePrimaryDomain = isolatedPrimaryDomain(topFrameHostName), primaryRedirectDomain = isolatedPrimaryDomain(hostNameRedirectedFrom)]() mutable {
>         if (m_memoryStore)
>             m_memoryStore->setTopFrameUniqueRedirectFrom(topFramePrimaryDomain, primaryRedirectDomain);
>         postTaskReply(WTFMove(completionHandler));
>diff --git a/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.cpp b/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.cpp
>index 429d132bb352080b44323b17d15bb349293fcbd2..5c03556dc51982ce6347b76dd416e9f7a3b28208 100644
>--- a/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.cpp
>+++ b/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.cpp
>@@ -1658,7 +1658,7 @@ void WebsiteDataStore::hasStorageAccess(String&& subFrameHost, String&& topFrame
>     }
> 
>     if (auto networkProcess = webPage->process().processPool().networkProcess())
>-        networkProcess->hasStorageAccess(m_sessionID, WTFMove(subFrameHost), WTFMove(topFrameHost), frameID, pageID, WTFMove(completionHandler));
>+        networkProcess->hasStorageAccess(m_sessionID, WebCore::ResourceLoadStatistics::primaryDomain(subFrameHost), WebCore::ResourceLoadStatistics::primaryDomain(topFrameHost), frameID, pageID, WTFMove(completionHandler));
> }
> 
> void WebsiteDataStore::requestStorageAccess(String&& subFrameHost, String&& topFrameHost, uint64_t frameID, uint64_t pageID, bool promptEnabled, CompletionHandler<void(StorageAccessStatus)>&& completionHandler)
>@@ -1675,7 +1675,7 @@ void WebsiteDataStore::requestStorageAccess(String&& subFrameHost, String&& topF
>     }
> 
>     if (auto networkProcess = webPage->process().processPool().networkProcess())
>-        networkProcess->requestStorageAccess(m_sessionID, WTFMove(subFrameHost), WTFMove(topFrameHost), frameID, pageID, promptEnabled, WTFMove(completionHandler));
>+        networkProcess->requestStorageAccess(m_sessionID, WebCore::ResourceLoadStatistics::primaryDomain(subFrameHost), WebCore::ResourceLoadStatistics::primaryDomain(topFrameHost), frameID, pageID, promptEnabled, WTFMove(completionHandler));
> }
> 
> void WebsiteDataStore::grantStorageAccess(String&& subFrameHost, String&& topFrameHost, uint64_t frameID, uint64_t pageID, bool userWasPrompted, CompletionHandler<void(bool)>&& completionHandler)
>@@ -1692,7 +1692,7 @@ void WebsiteDataStore::grantStorageAccess(String&& subFrameHost, String&& topFra
>     }
> 
>     if (auto networkProcess = webPage->process().processPool().networkProcess())
>-        networkProcess->grantStorageAccess(m_sessionID, WTFMove(subFrameHost), WTFMove(topFrameHost), frameID, pageID, userWasPrompted, WTFMove(completionHandler));
>+        networkProcess->grantStorageAccess(m_sessionID, WebCore::ResourceLoadStatistics::primaryDomain(subFrameHost), WebCore::ResourceLoadStatistics::primaryDomain(topFrameHost), frameID, pageID, userWasPrompted, WTFMove(completionHandler));
> }
> 
> void WebsiteDataStore::setTimeToLiveUserInteraction(Seconds seconds, CompletionHandler<void()>&& completionHandler)
>diff --git a/Source/WebKit/WebProcess/WebPage/WebPage.cpp b/Source/WebKit/WebProcess/WebPage/WebPage.cpp
>index 20a5a5a886dbe6a772cce608a1b241da13bc66f5..4f1ad1c0ce84aaaabec975348eb975e152e90b9b 100644
>--- a/Source/WebKit/WebProcess/WebPage/WebPage.cpp
>+++ b/Source/WebKit/WebProcess/WebPage/WebPage.cpp
>@@ -200,6 +200,7 @@
> #include <WebCore/RenderTheme.h>
> #include <WebCore/RenderTreeAsText.h>
> #include <WebCore/RenderView.h>
>+#include <WebCore/ResourceLoadStatistics.h>
> #include <WebCore/ResourceRequest.h>
> #include <WebCore/ResourceResponse.h>
> #include <WebCore/RuntimeEnabledFeatures.h>
>@@ -6390,13 +6391,13 @@ void WebPage::frameBecameRemote(uint64_t frameID, GlobalFrameIdentifier&& remote
> #if ENABLE(RESOURCE_LOAD_STATISTICS)
> void WebPage::hasStorageAccess(String&& subFrameHost, String&& topFrameHost, uint64_t frameID, CompletionHandler<void(bool)>&& completionHandler)
> {
>-    WebProcess::singleton().ensureNetworkProcessConnection().connection().sendWithAsyncReply(Messages::NetworkConnectionToWebProcess::HasStorageAccess(sessionID(), WTFMove(subFrameHost), WTFMove(topFrameHost), frameID, m_pageID), WTFMove(completionHandler));
>+    WebProcess::singleton().ensureNetworkProcessConnection().connection().sendWithAsyncReply(Messages::NetworkConnectionToWebProcess::HasStorageAccess(sessionID(), WebCore::ResourceLoadStatistics::primaryDomain(subFrameHost), WebCore::ResourceLoadStatistics::primaryDomain(topFrameHost), frameID, m_pageID), WTFMove(completionHandler));
> }
>     
> void WebPage::requestStorageAccess(String&& subFrameHost, String&& topFrameHost, uint64_t frameID, CompletionHandler<void(bool)>&& completionHandler)
> {
>     bool promptEnabled = RuntimeEnabledFeatures::sharedFeatures().storageAccessPromptsEnabled();
>-    WebProcess::singleton().ensureNetworkProcessConnection().connection().sendWithAsyncReply(Messages::NetworkConnectionToWebProcess::RequestStorageAccess(sessionID(), WTFMove(subFrameHost), WTFMove(topFrameHost), frameID, m_pageID, promptEnabled), WTFMove(completionHandler));
>+    WebProcess::singleton().ensureNetworkProcessConnection().connection().sendWithAsyncReply(Messages::NetworkConnectionToWebProcess::RequestStorageAccess(sessionID(), WebCore::ResourceLoadStatistics::primaryDomain(subFrameHost), WebCore::ResourceLoadStatistics::primaryDomain(topFrameHost), frameID, m_pageID, promptEnabled), WTFMove(completionHandler));
> }
> #endif
>

Actions: View | Formatted Diff | Diff

Attachments on bug 194664: 362051