From d3a9eb604ad29121879df94746d64d60b2314890 Mon Sep 17 00:00:00 2001 From: Yury Semikhatsky Date: Tue, 29 Mar 2022 20:04:42 -0700 Subject: [PATCH] browser(webkit): do not create NetworkProcess in ~WebsiteDataStore (#13169) --- browser_patches/webkit/BUILD_NUMBER | 4 ++-- browser_patches/webkit/patches/bootstrap.diff | 14 ++++++++++++-- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/browser_patches/webkit/BUILD_NUMBER b/browser_patches/webkit/BUILD_NUMBER index 709b735082..7ec2c31618 100644 --- a/browser_patches/webkit/BUILD_NUMBER +++ b/browser_patches/webkit/BUILD_NUMBER @@ -1,2 +1,2 @@ -1621 -Changed: dpino@igalia.com Thu Mar 24 15:05:11 UTC 2022 +1622 +Changed: yurys@chromium.org Tue 29 Mar 2022 08:03:00 PM PDT diff --git a/browser_patches/webkit/patches/bootstrap.diff b/browser_patches/webkit/patches/bootstrap.diff index 2b4c656524..af3780658f 100644 --- a/browser_patches/webkit/patches/bootstrap.diff +++ b/browser_patches/webkit/patches/bootstrap.diff @@ -17663,10 +17663,20 @@ index bfc7956c02ee5ace2d557343c507537a85cfd4fc..230d21c78633d1bd47c326d66fd92f4a WebConnection* webConnection() const { return m_webConnection.get(); } diff --git a/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.cpp b/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.cpp -index 50c9352b669c5869c7748c399ba21c8b7d590a13..29e31be2e732dc64a89a519929f7eadf1018c8d1 100644 +index 50c9352b669c5869c7748c399ba21c8b7d590a13..48e26325d5a6165fd0a175d74eae04ea99cb6ee3 100644 --- a/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.cpp +++ b/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.cpp -@@ -1988,6 +1988,17 @@ void WebsiteDataStore::renameOriginInWebsiteData(URL&& oldName, URL&& newName, O +@@ -150,7 +150,8 @@ WebsiteDataStore::~WebsiteDataStore() + + ASSERT(allDataStores().get(m_sessionID) == this); + allDataStores().remove(m_sessionID); +- networkProcess().removeSession(*this); ++ if (m_networkProcess) ++ m_networkProcess->removeSession(*this); + #if ENABLE(GPU_PROCESS) + if (auto* gpuProcessProxy = GPUProcessProxy::singletonIfCreated()) + gpuProcessProxy->removeSession(m_sessionID); +@@ -1988,6 +1989,17 @@ void WebsiteDataStore::renameOriginInWebsiteData(URL&& oldName, URL&& newName, O networkProcess().renameOriginInWebsiteData(m_sessionID, oldName, newName, dataTypes, WTFMove(completionHandler)); }