Filip/playwright
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

browser(webkit): pick process pool for service worker from correct context (#4116)

Browse source
This commit is contained in:
Yury Semikhatsky 2020-10-12 15:39:49 -07:00 committed by GitHub
parent 3350db2d1d
commit b2f4fa914a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 19 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
browser_patches/webkit/BUILD_NUMBER
View file

@ -1,2 +1,2 @@
1352
Changed: yurys@chromium.org Fri Oct 9 16:06:24 PDT 2020
1353
Changed: yurys@chromium.org Mon Oct 12 15:33:12 PDT 2020

19
browser_patches/webkit/patches/bootstrap.diff
View file

@ -12508,10 +12508,25 @@ index 42145f2c5c04b338ab041fb06d69686c2f579152..07d9076ab5db78c99558d9e6d057928d
PluginZoomFactorDidChange(double zoomFactor)
diff --git a/Source/WebKit/UIProcess/WebProcessPool.cpp b/Source/WebKit/UIProcess/WebProcessPool.cpp
index 8d987bb66d14340896128d73930f2a1cadd699a6..dfb1508188f2c5112cfaf53aea749067ce0c0159 100644
index 8d987bb66d14340896128d73930f2a1cadd699a6..ceda3697d560f76d451319acb484641e6764dd8b 100644
--- a/Source/WebKit/UIProcess/WebProcessPool.cpp
+++ b/Source/WebKit/UIProcess/WebProcessPool.cpp
@@ -745,7 +745,10 @@ void WebProcessPool::initializeNewWebProcess(WebProcessProxy& process, WebsiteDa
@@ -509,6 +509,14 @@ void WebProcessPool::establishWorkerContextConnectionToNetworkProcess(NetworkPro
// Arbitrarily choose the first process pool to host the service worker process.
auto* processPool = processPools()[0];
+ // Playwright begin
+ for (auto& process : websiteDataStore->processes()) {
+ if (process.processPoolIfExists()) {
+ processPool = process.processPoolIfExists();
+ break;
+ }
+ }
+ // Playwright end
ASSERT(processPool);
WebProcessProxy* serviceWorkerProcessProxy { nullptr };
@@ -745,7 +753,10 @@ void WebProcessPool::initializeNewWebProcess(WebProcessProxy& process, WebsiteDa
#endif
parameters.cacheModel = LegacyGlobalSettings::singleton().cacheModel();