Attachment 343370 Details for Bug 186903 – Patch

[patch] Patch

bug-186903-20180622144351.patch (text/plain), 35.09 KB, created by John Wilander on 2018-06-22 14:43:52 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: John Wilander

Created: 2018-06-22 14:43:52 PDT

Size: 35.09 KB

patch

obsolete

>Subversion Revision: 233087
>diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
>index 8479706535dee4f06bbb27df05c3f9526bd7d757..b8ab94b0e54899fab77960a04ab68e97aa316055 100644
>--- a/Source/WebKit/ChangeLog
>+++ b/Source/WebKit/ChangeLog
>@@ -1,3 +1,39 @@
>+2018-06-22  John Wilander  <wilander@apple.com>
>+
>+        Resource Load Statistics: Make WebResourceLoadStatisticsStore::updateCookiePartitioningForDomains() wait for the network process before calling its callback
>+        https://bugs.webkit.org/show_bug.cgi?id=186903
>+        <rdar://problem/41350182>
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        This patch stores the callback sent to
>+        WebResourceLoadStatisticsStore::updateCookiePartitioningForDomains(),
>+        sets up a context ID, and sends that ID to the network process when
>+        asking it to update cookie partitioning and blocking. The network
>+        process then tells the UI process when it's done, at which point the
>+        callback is called.
>+
>+        This change is meant to address layout test flakiness.
>+
>+        * NetworkProcess/NetworkProcess.cpp:
>+        (WebKit::NetworkProcess::updatePrevalentDomainsToPartitionOrBlockCookies):
>+        * NetworkProcess/NetworkProcess.h:
>+        * NetworkProcess/NetworkProcess.messages.in:
>+        * UIProcess/Network/NetworkProcessProxy.cpp:
>+        (WebKit::nextUpdatePartitionOrBlockCookiesContextId):
>+        (WebKit::NetworkProcessProxy::updatePrevalentDomainsToPartitionOrBlockCookies):
>+        (WebKit::NetworkProcessProxy::updatePartitionOrBlockCookiesDone):
>+        * UIProcess/Network/NetworkProcessProxy.h:
>+        * UIProcess/Network/NetworkProcessProxy.messages.in:
>+        * UIProcess/WebResourceLoadStatisticsStore.cpp:
>+        (WebKit::WebResourceLoadStatisticsStore::updateCookiePartitioning):
>+        (WebKit::WebResourceLoadStatisticsStore::updateCookiePartitioningForDomains):
>+        * UIProcess/WebResourceLoadStatisticsStore.h:
>+        * UIProcess/WebsiteData/WebsiteDataStore.cpp:
>+        (WebKit::WebsiteDataStore::updatePrevalentDomainsToPartitionOrBlockCookies):
>+        (WebKit::WebsiteDataStore::enableResourceLoadStatisticsAndSetTestingCallback):
>+        * UIProcess/WebsiteData/WebsiteDataStore.h:
>+
> 2018-06-22  Timothy Hatcher  <timothy@apple.com>
> 
>         Recalc styles every time defaultAppearance changes.
>diff --git a/Source/WebKit/NetworkProcess/NetworkProcess.cpp b/Source/WebKit/NetworkProcess/NetworkProcess.cpp
>index 184d127c38bf66af5e6c01df80039b2206f9e458..ba2dea5f71b4dee926fce2b6de5d7adbb64fd821 100644
>--- a/Source/WebKit/NetworkProcess/NetworkProcess.cpp
>+++ b/Source/WebKit/NetworkProcess/NetworkProcess.cpp
>@@ -403,10 +403,11 @@ void NetworkProcess::writeBlobToFilePath(const WebCore::URL& url, const String&
> }
> 
> #if HAVE(CFNETWORK_STORAGE_PARTITIONING)
>-void NetworkProcess::updatePrevalentDomainsToPartitionOrBlockCookies(PAL::SessionID sessionID, const Vector<String>& domainsToPartition, const Vector<String>& domainsToBlock, const Vector<String>& domainsToNeitherPartitionNorBlock, bool shouldClearFirst)
>+void NetworkProcess::updatePrevalentDomainsToPartitionOrBlockCookies(PAL::SessionID sessionID, const Vector<String>& domainsToPartition, const Vector<String>& domainsToBlock, const Vector<String>& domainsToNeitherPartitionNorBlock, bool shouldClearFirst, uint64_t contextId)
> {
>     if (auto* networkStorageSession = NetworkStorageSession::storageSession(sessionID))
>         networkStorageSession->setPrevalentDomainsToPartitionOrBlockCookies(domainsToPartition, domainsToBlock, domainsToNeitherPartitionNorBlock, shouldClearFirst);
>+    parentProcessConnection()->send(Messages::NetworkProcessProxy::UpdatePartitionOrBlockCookiesDone(contextId), 0);
> }
> 
> void NetworkProcess::hasStorageAccessForFrame(PAL::SessionID sessionID, const String& resourceDomain, const String& firstPartyDomain, uint64_t frameID, uint64_t pageID, uint64_t contextId)
>diff --git a/Source/WebKit/NetworkProcess/NetworkProcess.h b/Source/WebKit/NetworkProcess/NetworkProcess.h
>index be349319b1a4db8d34884bbb5192485a05052284..4cf6e45fd739dde06aa4675db450697871e65f0d 100644
>--- a/Source/WebKit/NetworkProcess/NetworkProcess.h
>+++ b/Source/WebKit/NetworkProcess/NetworkProcess.h
>@@ -134,7 +134,7 @@ public:
>     void grantSandboxExtensionsToStorageProcessForBlobs(const Vector<String>& filenames, Function<void ()>&& completionHandler);
> 
> #if HAVE(CFNETWORK_STORAGE_PARTITIONING)
>-    void updatePrevalentDomainsToPartitionOrBlockCookies(PAL::SessionID, const Vector<String>& domainsToPartition, const Vector<String>& domainsToBlock, const Vector<String>& domainsToNeitherPartitionNorBlock, bool shouldClearFirst);
>+    void updatePrevalentDomainsToPartitionOrBlockCookies(PAL::SessionID, const Vector<String>& domainsToPartition, const Vector<String>& domainsToBlock, const Vector<String>& domainsToNeitherPartitionNorBlock, 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);
>     void grantStorageAccess(PAL::SessionID, const String& resourceDomain, const String& firstPartyDomain, std::optional<uint64_t> frameID, uint64_t pageID, uint64_t contextId);
>diff --git a/Source/WebKit/NetworkProcess/NetworkProcess.messages.in b/Source/WebKit/NetworkProcess/NetworkProcess.messages.in
>index 8376bbc9b48a6b4138c414abdd9a6cc8f94eeadb..bba1df7f30387e72f900ae1600b50be8644b28a6 100644
>--- a/Source/WebKit/NetworkProcess/NetworkProcess.messages.in
>+++ b/Source/WebKit/NetworkProcess/NetworkProcess.messages.in
>@@ -81,7 +81,7 @@ messages -> NetworkProcess LegacyReceiver {
>     PreconnectTo(WebCore::URL url, enum WebCore::StoredCredentialsPolicy storedCredentialsPolicy);
> 
> #if HAVE(CFNETWORK_STORAGE_PARTITIONING)
>-    UpdatePrevalentDomainsToPartitionOrBlockCookies(PAL::SessionID sessionID, Vector<String> domainsToPartition, Vector<String> domainsToBlock, Vector<String> domainsToNeitherPartitionNorBlock, bool shouldClearFirst)
>+    UpdatePrevalentDomainsToPartitionOrBlockCookies(PAL::SessionID sessionID, Vector<String> domainsToPartition, Vector<String> domainsToBlock, Vector<String> domainsToNeitherPartitionNorBlock, 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)
>     GrantStorageAccess(PAL::SessionID sessionID, String resourceDomain, String firstPartyDomain, std::optional<uint64_t> frameID, uint64_t pageID, uint64_t contextId)
>diff --git a/Source/WebKit/UIProcess/Network/NetworkProcessProxy.cpp b/Source/WebKit/UIProcess/Network/NetworkProcessProxy.cpp
>index e7b2eec41562d29ff0b279a94abea646e84a3b23..06efd3893406a6974600ad899c1ded0a107c5bb7 100644
>--- a/Source/WebKit/UIProcess/Network/NetworkProcessProxy.cpp
>+++ b/Source/WebKit/UIProcess/Network/NetworkProcessProxy.cpp
>@@ -431,6 +431,31 @@ void NetworkProcessProxy::canAuthenticateAgainstProtectionSpace(uint64_t loaderI
> #endif
> 
> #if HAVE(CFNETWORK_STORAGE_PARTITIONING)
>+static uint64_t nextUpdatePartitionOrBlockCookiesContextId()
>+{
>+    static uint64_t nextContextId = 0;
>+    return ++nextContextId;
>+}
>+
>+void NetworkProcessProxy::updatePrevalentDomainsToPartitionOrBlockCookies(PAL::SessionID sessionID, const Vector<String>& domainsToPartition, const Vector<String>& domainsToBlock, const Vector<String>& domainsToNeitherPartitionNorBlock, ShouldClearFirst shouldClearFirst, CompletionHandler<void()>&& callback)
>+{
>+    if (!canSendMessage()) {
>+        callback();
>+        return;
>+    }
>+    
>+    auto contextId = nextUpdatePartitionOrBlockCookiesContextId();
>+    auto addResult = m_updatePartitionOrBlockCookiesCallbackMap.add(contextId, WTFMove(callback));
>+    ASSERT_UNUSED(addResult, addResult.isNewEntry);
>+    send(Messages::NetworkProcess::UpdatePrevalentDomainsToPartitionOrBlockCookies(sessionID, domainsToPartition, domainsToBlock, domainsToNeitherPartitionNorBlock, shouldClearFirst == ShouldClearFirst::Yes, contextId), 0);
>+}
>+
>+void NetworkProcessProxy::updatePartitionOrBlockCookiesDone(uint64_t contextId)
>+{
>+    auto callback = m_updatePartitionOrBlockCookiesCallbackMap.take(contextId);
>+    callback();
>+}
>+
> static uint64_t nextRequestStorageAccessContextId()
> {
>     static uint64_t nextContextId = 0;
>diff --git a/Source/WebKit/UIProcess/Network/NetworkProcessProxy.h b/Source/WebKit/UIProcess/Network/NetworkProcessProxy.h
>index 6cc521c6ac1d4c4cf0aa48727498107c20a3a46f..7e02d0f5d39d4c004bee04a01f2495e1295bf5eb 100644
>--- a/Source/WebKit/UIProcess/Network/NetworkProcessProxy.h
>+++ b/Source/WebKit/UIProcess/Network/NetworkProcessProxy.h
>@@ -78,6 +78,7 @@ public:
>     void deleteWebsiteDataForOrigins(PAL::SessionID, OptionSet<WebKit::WebsiteDataType>, const Vector<WebCore::SecurityOriginData>& origins, const Vector<String>& cookieHostNames, WTF::Function<void()>&& completionHandler);
> 
> #if HAVE(CFNETWORK_STORAGE_PARTITIONING)
>+    void updatePrevalentDomainsToPartitionOrBlockCookies(PAL::SessionID, const Vector<String>& domainsToPartition, const Vector<String>& domainsToBlock, const Vector<String>& domainsToNeitherPartitionNorBlock, 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)>&&);
>     void grantStorageAccess(PAL::SessionID, const String& resourceDomain, const String& firstPartyDomain, std::optional<uint64_t> frameID, uint64_t pageID, CompletionHandler<void(bool)>&& callback);
>@@ -144,6 +145,7 @@ private:
>     void canAuthenticateAgainstProtectionSpace(uint64_t loaderID, uint64_t pageID, uint64_t frameID, const WebCore::ProtectionSpace&);
> #endif
> #if HAVE(CFNETWORK_STORAGE_PARTITIONING)
>+    void updatePartitionOrBlockCookiesDone(uint64_t contextId);
>     void storageAccessRequestResult(bool wasGranted, uint64_t contextId);
>     void allStorageAccessEntriesResult(Vector<String>&& domains, uint64_t contextId);
> #endif
>@@ -176,7 +178,8 @@ private:
>     unsigned m_syncAllCookiesCounter { 0 };
> 
>     HashMap<uint64_t, CompletionHandler<void(bool success)>> m_writeBlobToFilePathCallbackMap;
>-    HashMap<uint64_t, WTF::CompletionHandler<void(bool wasGranted)>> m_storageAccessResponseCallbackMap;
>+    HashMap<uint64_t, CompletionHandler<void()>> m_updatePartitionOrBlockCookiesCallbackMap;
>+    HashMap<uint64_t, CompletionHandler<void(bool wasGranted)>> m_storageAccessResponseCallbackMap;
>     HashMap<uint64_t, CompletionHandler<void(Vector<String>&& domains)>> m_allStorageAccessEntriesCallbackMap;
> 
> #if ENABLE(CONTENT_EXTENSIONS)
>diff --git a/Source/WebKit/UIProcess/Network/NetworkProcessProxy.messages.in b/Source/WebKit/UIProcess/Network/NetworkProcessProxy.messages.in
>index 996a4a595d293537287d2e0a67222983f0c2b505..953b7c3d240fcd8046f307815e5e2394f7efcce3 100644
>--- a/Source/WebKit/UIProcess/Network/NetworkProcessProxy.messages.in
>+++ b/Source/WebKit/UIProcess/Network/NetworkProcessProxy.messages.in
>@@ -47,6 +47,7 @@ messages -> NetworkProcessProxy LegacyReceiver {
>     CanAuthenticateAgainstProtectionSpace(uint64_t loaderID, uint64_t pageID, uint64_t frameID, WebCore::ProtectionSpace protectionSpace)
> #endif
> #if HAVE(CFNETWORK_STORAGE_PARTITIONING)
>+    UpdatePartitionOrBlockCookiesDone(uint64_t contextId)
>     StorageAccessRequestResult(bool wasGranted, uint64_t contextId)
>     AllStorageAccessEntriesResult(Vector<String> domains, uint64_t contextId)
> #endif
>diff --git a/Source/WebKit/UIProcess/WebResourceLoadStatisticsStore.cpp b/Source/WebKit/UIProcess/WebResourceLoadStatisticsStore.cpp
>index fbd5bb55ab548c3f62d8801c017de92ed53b4a57..a43643f4dffa63a1672f6a60f3d33eb920a3b685 100644
>--- a/Source/WebKit/UIProcess/WebResourceLoadStatisticsStore.cpp
>+++ b/Source/WebKit/UIProcess/WebResourceLoadStatisticsStore.cpp
>@@ -1302,10 +1302,7 @@ void WebResourceLoadStatisticsStore::updateCookiePartitioning(CompletionHandler<
> #endif
> 
>     RunLoop::main().dispatch([this, protectedThis = makeRef(*this), domainsToPartition = crossThreadCopy(domainsToPartition), domainsToBlock = crossThreadCopy(domainsToBlock), domainsToNeitherPartitionNorBlock = crossThreadCopy(domainsToNeitherPartitionNorBlock), completionHandler = WTFMove(completionHandler)] () mutable {
>-        m_updatePrevalentDomainsToPartitionOrBlockCookiesHandler(domainsToPartition, domainsToBlock, domainsToNeitherPartitionNorBlock, ShouldClearFirst::No);
>-        m_statisticsQueue->dispatch([completionHandler = WTFMove(completionHandler)] () {
>-            completionHandler();
>-        });
>+        m_updatePrevalentDomainsToPartitionOrBlockCookiesHandler(domainsToPartition, domainsToBlock, domainsToNeitherPartitionNorBlock, ShouldClearFirst::No, WTFMove(completionHandler));
> #if !RELEASE_LOG_DISABLED
>         RELEASE_LOG_INFO_IF(m_debugLoggingEnabled, ResourceLoadStatisticsDebug, "Done updating cookie partitioning and blocking.");
> #endif
>@@ -1320,10 +1317,6 @@ void WebResourceLoadStatisticsStore::updateCookiePartitioningForDomains(const Ve
>         return;
>     }
>     
>-    RunLoop::main().dispatch([this, shouldClearFirst, protectedThis = makeRef(*this), domainsToPartition = crossThreadCopy(domainsToPartition), domainsToBlock = crossThreadCopy(domainsToBlock), domainsToNeitherPartitionNorBlock = crossThreadCopy(domainsToNeitherPartitionNorBlock)] () {
>-        m_updatePrevalentDomainsToPartitionOrBlockCookiesHandler(domainsToPartition, domainsToBlock, domainsToNeitherPartitionNorBlock, shouldClearFirst);
>-    });
>-
>     if (shouldClearFirst == ShouldClearFirst::Yes)
>         resetCookiePartitioningState();
>     else {
>@@ -1340,7 +1333,9 @@ void WebResourceLoadStatisticsStore::updateCookiePartitioningForDomains(const Ve
>     for (auto& domain : domainsToBlock)
>         ensureResourceStatisticsForPrimaryDomain(domain).isMarkedForCookieBlocking = true;
> 
>-    completionHandler();
>+    RunLoop::main().dispatch([this, shouldClearFirst, protectedThis = makeRef(*this), domainsToPartition = crossThreadCopy(domainsToPartition), domainsToBlock = crossThreadCopy(domainsToBlock), domainsToNeitherPartitionNorBlock = crossThreadCopy(domainsToNeitherPartitionNorBlock), completionHandler = WTFMove(completionHandler)] () mutable {
>+        m_updatePrevalentDomainsToPartitionOrBlockCookiesHandler(domainsToPartition, domainsToBlock, domainsToNeitherPartitionNorBlock, shouldClearFirst, WTFMove(completionHandler));
>+    });
> }
> 
> void WebResourceLoadStatisticsStore::clearPartitioningStateForDomains(const Vector<String>& domains, CompletionHandler<void()>&& completionHandler)
>diff --git a/Source/WebKit/UIProcess/WebResourceLoadStatisticsStore.h b/Source/WebKit/UIProcess/WebResourceLoadStatisticsStore.h
>index ee68e850d83357a58f41190d2c715aaeda686bab..1e421efdf25eb0380cc4763825a403f811e08e0a 100644
>--- a/Source/WebKit/UIProcess/WebResourceLoadStatisticsStore.h
>+++ b/Source/WebKit/UIProcess/WebResourceLoadStatisticsStore.h
>@@ -68,12 +68,12 @@ enum class StorageAccessStatus {
> 
> class WebResourceLoadStatisticsStore final : public IPC::Connection::WorkQueueMessageReceiver {
> public:
>-    using UpdatePrevalentDomainsToPartitionOrBlockCookiesHandler = WTF::Function<void(const Vector<String>& domainsToPartition, const Vector<String>& domainsToBlock, const Vector<String>& domainsToNeitherPartitionNorBlock, ShouldClearFirst)>;
>+    using UpdatePrevalentDomainsToPartitionOrBlockCookiesHandler = WTF::Function<void(const Vector<String>& domainsToPartition, const Vector<String>& domainsToBlock, const Vector<String>& domainsToNeitherPartitionNorBlock, ShouldClearFirst, CompletionHandler<void()>&&)>;
>     using HasStorageAccessForFrameHandler = WTF::Function<void(const String& resourceDomain, const String& firstPartyDomain, uint64_t frameID, uint64_t pageID, WTF::Function<void(bool hasAccess)>&& callback)>;
>     using GrantStorageAccessHandler = WTF::Function<void(const String& resourceDomain, const String& firstPartyDomain, std::optional<uint64_t> frameID, uint64_t pageID, WTF::Function<void(bool wasGranted)>&& callback)>;
>     using RemoveAllStorageAccessHandler = WTF::Function<void()>;
>     using RemovePrevalentDomainsHandler = WTF::Function<void (const Vector<String>&)>;
>-    static Ref<WebResourceLoadStatisticsStore> create(const String& resourceLoadStatisticsDirectory, Function<void (const String&)>&& testingCallback, bool isEphemeral, UpdatePrevalentDomainsToPartitionOrBlockCookiesHandler&& updatePrevalentDomainsToPartitionOrBlockCookiesHandler = [](const WTF::Vector<String>&, const WTF::Vector<String>&, const WTF::Vector<String>&, ShouldClearFirst) { }, HasStorageAccessForFrameHandler&& hasStorageAccessForFrameHandler = [](const String&, const String&, uint64_t, uint64_t, WTF::Function<void(bool)>&&) { }, GrantStorageAccessHandler&& grantStorageAccessHandler = [](const String&, const String&, std::optional<uint64_t>, uint64_t, WTF::Function<void(bool)>&&) { }, RemoveAllStorageAccessHandler&& removeAllStorageAccessHandler = []() { }, RemovePrevalentDomainsHandler&& removeDomainsHandler = [] (const WTF::Vector<String>&) { })
>+    static Ref<WebResourceLoadStatisticsStore> create(const String& resourceLoadStatisticsDirectory, Function<void (const String&)>&& testingCallback, bool isEphemeral, UpdatePrevalentDomainsToPartitionOrBlockCookiesHandler&& updatePrevalentDomainsToPartitionOrBlockCookiesHandler = [](const WTF::Vector<String>&, const WTF::Vector<String>&, const WTF::Vector<String>&, ShouldClearFirst, CompletionHandler<void()>&& callback = []() { }) { }, HasStorageAccessForFrameHandler&& hasStorageAccessForFrameHandler = [](const String&, const String&, uint64_t, uint64_t, WTF::Function<void(bool)>&&) { }, GrantStorageAccessHandler&& grantStorageAccessHandler = [](const String&, const String&, std::optional<uint64_t>, uint64_t, WTF::Function<void(bool)>&&) { }, RemoveAllStorageAccessHandler&& removeAllStorageAccessHandler = []() { }, RemovePrevalentDomainsHandler&& removeDomainsHandler = [] (const WTF::Vector<String>&) { })
>     {
>         return adoptRef(*new WebResourceLoadStatisticsStore(resourceLoadStatisticsDirectory, WTFMove(testingCallback), isEphemeral, WTFMove(updatePrevalentDomainsToPartitionOrBlockCookiesHandler), WTFMove(hasStorageAccessForFrameHandler), WTFMove(grantStorageAccessHandler), WTFMove(removeAllStorageAccessHandler), WTFMove(removeDomainsHandler)));
>     }
>diff --git a/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.cpp b/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.cpp
>index c3f3182df05c8f1c558031b5c5fea4c01cd3cdc5..ed37d42948cb1b5255d86921e2d39963ca71d4cc 100644
>--- a/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.cpp
>+++ b/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.cpp
>@@ -1205,10 +1205,10 @@ void WebsiteDataStore::removeDataForTopPrivatelyControlledDomains(OptionSet<Webs
> }
> 
> #if HAVE(CFNETWORK_STORAGE_PARTITIONING)
>-void WebsiteDataStore::updatePrevalentDomainsToPartitionOrBlockCookies(const Vector<String>& domainsToPartition, const Vector<String>& domainsToBlock, const Vector<String>& domainsToNeitherPartitionNorBlock, ShouldClearFirst shouldClearFirst)
>+void WebsiteDataStore::updatePrevalentDomainsToPartitionOrBlockCookies(const Vector<String>& domainsToPartition, const Vector<String>& domainsToBlock, const Vector<String>& domainsToNeitherPartitionNorBlock, ShouldClearFirst shouldClearFirst, CompletionHandler<void()>&& completionHandler)
> {
>     for (auto& processPool : processPools())
>-        processPool->sendToNetworkingProcess(Messages::NetworkProcess::UpdatePrevalentDomainsToPartitionOrBlockCookies(m_sessionID, domainsToPartition, domainsToBlock, domainsToNeitherPartitionNorBlock, shouldClearFirst == ShouldClearFirst::Yes));
>+        processPool->networkProcess()->updatePrevalentDomainsToPartitionOrBlockCookies(m_sessionID, domainsToPartition, domainsToBlock, domainsToNeitherPartitionNorBlock, shouldClearFirst, WTFMove(completionHandler));
> }
> 
> void WebsiteDataStore::hasStorageAccessForFrameHandler(const String& resourceDomain, const String& firstPartyDomain, uint64_t frameID, uint64_t pageID, WTF::CompletionHandler<void(bool hasAccess)>&& callback)
>@@ -1472,15 +1472,15 @@ void WebsiteDataStore::enableResourceLoadStatisticsAndSetTestingCallback(Functio
>     }
> 
> #if HAVE(CFNETWORK_STORAGE_PARTITIONING)
>-    m_resourceLoadStatistics = WebResourceLoadStatisticsStore::create(m_configuration.resourceLoadStatisticsDirectory, WTFMove(callback), m_sessionID.isEphemeral(), [weakThis = makeWeakPtr(*this)] (const Vector<String>& domainsToPartition, const Vector<String>& domainsToBlock, const Vector<String>& domainsToNeitherPartitionNorBlock, ShouldClearFirst shouldClearFirst) {
>+    m_resourceLoadStatistics = WebResourceLoadStatisticsStore::create(m_configuration.resourceLoadStatisticsDirectory, WTFMove(callback), m_sessionID.isEphemeral(), [weakThis = makeWeakPtr(*this)] (const Vector<String>& domainsToPartition, const Vector<String>& domainsToBlock, const Vector<String>& domainsToNeitherPartitionNorBlock, ShouldClearFirst shouldClearFirst, CompletionHandler<void()>&& completionHandler) {
>         if (weakThis)
>-            weakThis->updatePrevalentDomainsToPartitionOrBlockCookies(domainsToPartition, domainsToBlock, domainsToNeitherPartitionNorBlock, shouldClearFirst);
>-    }, [weakThis = makeWeakPtr(*this)] (const String& resourceDomain, const String& firstPartyDomain, uint64_t frameID, uint64_t pageID, WTF::CompletionHandler<void(bool hasAccess)>&& callback) {
>+            weakThis->updatePrevalentDomainsToPartitionOrBlockCookies(domainsToPartition, domainsToBlock, domainsToNeitherPartitionNorBlock, shouldClearFirst, WTFMove(completionHandler));
>+    }, [weakThis = makeWeakPtr(*this)] (const String& resourceDomain, const String& firstPartyDomain, uint64_t frameID, uint64_t pageID, CompletionHandler<void(bool hasAccess)>&& completionHandler) {
>         if (weakThis)
>-            weakThis->hasStorageAccessForFrameHandler(resourceDomain, firstPartyDomain, frameID, pageID, WTFMove(callback));
>-    }, [weakThis = makeWeakPtr(*this)] (const String& resourceDomain, const String& firstPartyDomain, std::optional<uint64_t> frameID, uint64_t pageID, WTF::CompletionHandler<void(bool wasGranted)>&& callback) {
>+            weakThis->hasStorageAccessForFrameHandler(resourceDomain, firstPartyDomain, frameID, pageID, WTFMove(completionHandler));
>+    }, [weakThis = makeWeakPtr(*this)] (const String& resourceDomain, const String& firstPartyDomain, std::optional<uint64_t> frameID, uint64_t pageID, WTF::CompletionHandler<void(bool wasGranted)>&& completionHandler) {
>         if (weakThis)
>-            weakThis->grantStorageAccessHandler(resourceDomain, firstPartyDomain, frameID, pageID, WTFMove(callback));
>+            weakThis->grantStorageAccessHandler(resourceDomain, firstPartyDomain, frameID, pageID, WTFMove(completionHandler));
>     }, [weakThis = makeWeakPtr(*this)] () {
>         if (weakThis)
>             weakThis->removeAllStorageAccessHandler();
>@@ -1489,7 +1489,7 @@ void WebsiteDataStore::enableResourceLoadStatisticsAndSetTestingCallback(Functio
>             weakThis->removePrevalentDomains(domainsToRemove);
>     });
> #else
>-    m_resourceLoadStatistics = WebResourceLoadStatisticsStore::create(m_configuration.resourceLoadStatisticsDirectory, WTFMove(callback), m_sessionID.isEphemeral());
>+    m_resourceLoadStatistics = WebResourceLoadStatisticsStore::create(m_configuration.resourceLoadStatisticsDirectory, WTFMove(completionHandler), m_sessionID.isEphemeral());
> #endif
> 
>     for (auto& processPool : processPools(std::numeric_limits<size_t>::max(), false))
>diff --git a/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.h b/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.h
>index 978c3d945c5c083cbcfcf67c842ab2639d0071aa..1a56a018698551eec3a608d46c46822ce4652b9b 100644
>--- a/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.h
>+++ b/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.h
>@@ -130,13 +130,13 @@ public:
>     void removeDataForTopPrivatelyControlledDomains(OptionSet<WebsiteDataType>, OptionSet<WebsiteDataFetchOption>, const Vector<String>& topPrivatelyControlledDomains, Function<void(HashSet<String>&&)>&& completionHandler);
> 
> #if HAVE(CFNETWORK_STORAGE_PARTITIONING)
>-    void updatePrevalentDomainsToPartitionOrBlockCookies(const Vector<String>& domainsToPartition, const Vector<String>& domainsToBlock, const Vector<String>& domainsToNeitherPartitionNorBlock, ShouldClearFirst);
>-    void hasStorageAccessForFrameHandler(const String& resourceDomain, const String& firstPartyDomain, uint64_t frameID, uint64_t pageID, WTF::CompletionHandler<void(bool hasAccess)>&& callback);
>+    void updatePrevalentDomainsToPartitionOrBlockCookies(const Vector<String>& domainsToPartition, const Vector<String>& domainsToBlock, const Vector<String>& domainsToNeitherPartitionNorBlock, ShouldClearFirst, CompletionHandler<void()>&&);
>+    void hasStorageAccessForFrameHandler(const String& resourceDomain, const String& firstPartyDomain, uint64_t frameID, uint64_t pageID, CompletionHandler<void(bool hasAccess)>&&);
>     void getAllStorageAccessEntries(CompletionHandler<void(Vector<String>&& domains)>&&);
>-    void grantStorageAccessHandler(const String& resourceDomain, const String& firstPartyDomain, std::optional<uint64_t> frameID, uint64_t pageID, WTF::CompletionHandler<void(bool wasGranted)>&& callback);
>+    void grantStorageAccessHandler(const String& resourceDomain, const String& firstPartyDomain, std::optional<uint64_t> frameID, uint64_t pageID, CompletionHandler<void(bool wasGranted)>&&);
>     void removeAllStorageAccessHandler();
>     void removePrevalentDomains(const Vector<String>& domains);
>-    void hasStorageAccess(String&& subFrameHost, String&& topFrameHost, uint64_t frameID, uint64_t pageID, WTF::CompletionHandler<void (bool)>&& callback);
>+    void hasStorageAccess(String&& subFrameHost, String&& topFrameHost, uint64_t frameID, uint64_t pageID, CompletionHandler<void(bool)>&&);
>     void requestStorageAccess(String&& subFrameHost, String&& topFrameHost, uint64_t frameID, uint64_t pageID, bool promptEnabled, CompletionHandler<void(StorageAccessStatus)>&&);
>     void grantStorageAccess(String&& subFrameHost, String&& topFrameHost, uint64_t frameID, uint64_t pageID, bool userWasPrompted, CompletionHandler<void(bool)>&&);
> #endif
>diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
>index fb46cee76271679c506882242bbc9db1ee297c0d..b43b316c101d6c5360d19c4a6b262208d7dd6366 100644
>--- a/LayoutTests/ChangeLog
>+++ b/LayoutTests/ChangeLog
>@@ -1,3 +1,17 @@
>+2018-06-22  John Wilander  <wilander@apple.com>
>+
>+        Resource Load Statistics: Make WebResourceLoadStatisticsStore::updateCookiePartitioningForDomains() wait for the network process before calling its callback
>+        https://bugs.webkit.org/show_bug.cgi?id=186903
>+        <rdar://problem/41350182>
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * http/tests/storageAccess/grant-storage-access-under-opener-expected.txt:
>+        * http/tests/storageAccess/grant-storage-access-under-opener.html:
>+            Moved the code block to the page's body instead of its head.
>+            Added an initial console log statement. The reason for these
>+            changes is that we're seeing flaky timeouts with no output.
>+
> 2018-06-22  Michael Catanzaro  <mcatanzaro@igalia.com>
> 
>         REGRESSION(r230950): [GTK] WebKit::CoordinatedBackingStoreTile::setBackBuffer(): WebKitWebProcess killed by SIGSEGV (ASSERTION FAILED: it != m_tiles.end())
>diff --git a/LayoutTests/http/tests/storageAccess/grant-storage-access-under-opener-expected.txt b/LayoutTests/http/tests/storageAccess/grant-storage-access-under-opener-expected.txt
>index 530880414211bfb87e316df5b15e421ea218d75f..bc5a8098515387071dce1aeb7ca5e26064e9aa30 100644
>--- a/LayoutTests/http/tests/storageAccess/grant-storage-access-under-opener-expected.txt
>+++ b/LayoutTests/http/tests/storageAccess/grant-storage-access-under-opener-expected.txt
>@@ -1,7 +1,8 @@
>-CONSOLE MESSAGE: line 54: Running test.
>-CONSOLE MESSAGE: line 67: About to call testRunner.statisticsUpdateCookiePartitioning().
>-CONSOLE MESSAGE: line 69: About to open the new window.
>-CONSOLE MESSAGE: line 43: About to open the third party iframe.
>+CONSOLE MESSAGE: line 8: First JavaScript statement.
>+CONSOLE MESSAGE: line 57: Running test.
>+CONSOLE MESSAGE: line 73: About to call testRunner.statisticsUpdateCookiePartitioning().
>+CONSOLE MESSAGE: line 75: About to open the new window.
>+CONSOLE MESSAGE: line 45: About to open the third party iframe.
> Tests that a cross-origin window from a prevalent domain with non-recent user interaction gets immediate storage access under its opener.
> 
> On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
>diff --git a/LayoutTests/http/tests/storageAccess/grant-storage-access-under-opener.html b/LayoutTests/http/tests/storageAccess/grant-storage-access-under-opener.html
>index 1cbd1c77b9b31a2f9cf47984396ac6c772c00513..c4a3e475acec3a1a04e30b5efb6bc1ee2dfb87e8 100644
>--- a/LayoutTests/http/tests/storageAccess/grant-storage-access-under-opener.html
>+++ b/LayoutTests/http/tests/storageAccess/grant-storage-access-under-opener.html
>@@ -2,76 +2,80 @@
> <html>
> <head>
>     <script src="/js-test-resources/js-test.js"></script>
>-    <script>
>-        description("Tests that a cross-origin window from a prevalent domain with non-recent user interaction gets immediate storage access under its opener.");
>-        jsTestIsAsync = true;
>+</head>
>+<body onload="run()">
>+<script>
>+    console.log("First JavaScript statement.");
> 
>-        function setEnableFeature(enable) {
>-            if (!enable)
>-                testRunner.statisticsResetToConsistentState();
>-            internals.setResourceLoadStatisticsEnabled(enable);
>-            testRunner.setCookieStoragePartitioningEnabled(enable);
>-            testRunner.setStorageAccessAPIEnabled(enable);
>-        }
>+    description("Tests that a cross-origin window from a prevalent domain with non-recent user interaction gets immediate storage access under its opener.");
>+    jsTestIsAsync = true;
> 
>-        window.addEventListener("message", receiveMessage, false);
>+    function setEnableFeature(enable) {
>+        if (!enable)
>+            testRunner.statisticsResetToConsistentState();
>+        internals.setResourceLoadStatisticsEnabled(enable);
>+        testRunner.setCookieStoragePartitioningEnabled(enable);
>+        testRunner.setStorageAccessAPIEnabled(enable);
>+    }
> 
>-        function finishTest() {
>-            setEnableFeature(false);
>-            finishJSTest();
>-        }
>+    function finishTest() {
>+        setEnableFeature(false);
>+        finishJSTest();
>+    }
> 
>-        function openIframe(url, onLoadHandler) {
>-            const element = document.createElement("iframe");
>-            element.src = url;
>-            if (onLoadHandler) {
>-                element.onload = onLoadHandler;
>-            }
>-            document.body.appendChild(element);
>+    function openIframe(url, onLoadHandler) {
>+        const element = document.createElement("iframe");
>+        element.src = url;
>+        if (onLoadHandler) {
>+            element.onload = onLoadHandler;
>         }
>+        document.body.appendChild(element);
>+    }
> 
>-        function receiveMessage(event) {
>-            if (event.origin === "http://localhost:8000") {
>-                if (event.data.indexOf("PASS") !== -1)
>-                    testPassed(event.data.replace("PASS ", ""));
>-                else
>-                    testFailed(event.data);
>-            } else
>-                testFailed("Received a message from an unexpected origin: " + event.origin);
>+    function receiveMessage(event) {
>+        if (event.origin === "http://localhost:8000") {
>+            if (event.data.indexOf("PASS") !== -1)
>+                testPassed(event.data.replace("PASS ", ""));
>+            else
>+                testFailed(event.data);
>+        } else
>+            testFailed("Received a message from an unexpected origin: " + event.origin);
> 
>-            newWin.close();
>-            console.log("About to open the third party iframe.");
>-            openIframe(thirdPartyBaseUrl + subPathToGetCookies + "&message=Should receive first-party cookie.", finishTest);
>-        }
>+        newWin.close();
>+        console.log("About to open the third party iframe.");
>+        openIframe(thirdPartyBaseUrl + subPathToGetCookies + "&message=Should receive first-party cookie.", finishTest);
>+    }
> 
>-        const thirdPartyOrigin = "http://localhost:8000";
>-        const resourcePath = "/storageAccess/resources";
>-        const thirdPartyBaseUrl = thirdPartyOrigin + resourcePath;
>-        const firstPartyCookieName = "firstPartyCookie";
>-        const subPathToGetCookies = "/get-cookies.php?name1=" + firstPartyCookieName;
>-        var newWin;
>-        function run() {
>-            console.log("Running test.");
>-            setEnableFeature(true);
>-            testRunner.setCanOpenWindows();
>+    const thirdPartyOrigin = "http://localhost:8000";
>+    const resourcePath = "/storageAccess/resources";
>+    const thirdPartyBaseUrl = thirdPartyOrigin + resourcePath;
>+    const firstPartyCookieName = "firstPartyCookie";
>+    const subPathToGetCookies = "/get-cookies.php?name1=" + firstPartyCookieName;
>+    var newWin;
> 
>-            testRunner.setStatisticsPrevalentResource(thirdPartyOrigin, true);
>-            if (!testRunner.isStatisticsPrevalentResource(thirdPartyOrigin))
>-                testFailed("Host did not get set as prevalent resource.");
>-            testRunner.setStatisticsHasHadNonRecentUserInteraction(thirdPartyOrigin, true);
>-            if (!testRunner.isStatisticsHasHadUserInteraction(thirdPartyOrigin))
>-                testFailed("Host did not get logged for user interaction.");
>-            testRunner.dumpChildFramesAsText();
>-            testRunner.setCloseRemainingWindowsWhenComplete(true);
>+    function run() {
>+        console.log("Running test.");
>+        setEnableFeature(true);
> 
>-            console.log("About to call testRunner.statisticsUpdateCookiePartitioning().");
>-            testRunner.statisticsUpdateCookiePartitioning(function () {
>-                console.log("About to open the new window.");
>-                newWin = window.open(thirdPartyOrigin + "/storageAccess/resources/set-cookie-and-report-back.html", "testWindow");
>-            });
>-        }
>-    </script>
>-</head>
>-<body onload="run()">
>+        window.addEventListener("message", receiveMessage, false);
>+
>+        testRunner.setCanOpenWindows();
>+
>+        testRunner.setStatisticsPrevalentResource(thirdPartyOrigin, true);
>+        if (!testRunner.isStatisticsPrevalentResource(thirdPartyOrigin))
>+            testFailed("Host did not get set as prevalent resource.");
>+        testRunner.setStatisticsHasHadNonRecentUserInteraction(thirdPartyOrigin, true);
>+        if (!testRunner.isStatisticsHasHadUserInteraction(thirdPartyOrigin))
>+            testFailed("Host did not get logged for user interaction.");
>+        testRunner.dumpChildFramesAsText();
>+        testRunner.setCloseRemainingWindowsWhenComplete(true);
>+
>+        console.log("About to call testRunner.statisticsUpdateCookiePartitioning().");
>+        testRunner.statisticsUpdateCookiePartitioning(function () {
>+            console.log("About to open the new window.");
>+            newWin = window.open(thirdPartyOrigin + "/storageAccess/resources/set-cookie-and-report-back.html", "testWindow");
>+        });
>+    }
>+</script>
> </body>
> </html>
>\ No newline at end of file

Actions: View | Formatted Diff | Diff

Attachments on bug 186903: 343297 | 343370 | 343389 | 343520 | 343539 | 343550 | 343614