92496c1930
* chore: bump chromium in DEPS to 128.0.6613.0 * chore: 5725076: Update EventType names | https://chromium-review.googlesource.com/c/chromium/src/+/5725076 * chore: export patches * chore: 5725076: Update EventType names | https://chromium-review.googlesource.com/c/chromium/src/+/5725076 for windows * chore: bump chromium in DEPS to 129.0.6614.0 * 5725672: Add a feature to limit the number of preconnect in LoadingPredictor | https://chromium-review.googlesource.com/c/chromium/src/+/5725672 * chore: bump chromium in DEPS to 129.0.6616.0 * chore: e patches all and resolve conflict in patches/v8/fix_disable_scope_reuse_associated_dchecks.patch * 5730656: Show an error dialog when UpdatePrintSettings() fails | https://chromium-review.googlesource.com/c/chromium/src/+/5730656 * chore: gen-libc++-filenames * 5729956: Finally remove string_piece.h | https://chromium-review.googlesource.com/c/chromium/src/+/5729956 * chore: replace all references of base::StringPiece with std::string_view * chore: remove more references of stringPiece in favor of string_view * chore: rename string_piece variables to string_view * 5508795: Remove the NotificationService | https://chromium-review.googlesource.com/c/chromium/src/+/5508795 * 5734053: Revert Rename GlobalFeatures to GlobalDesktopFeatures. | https://chromium-review.googlesource.com/c/chromium/src/+/5734053 * chore: resolve conflict with main without merge --------- Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: Alice Zhao <alice@makenotion.com>
62 lines
3.4 KiB
Diff
62 lines
3.4 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: deepak1556 <hop2deep@gmail.com>
|
|
Date: Fri, 20 May 2022 00:29:34 +0900
|
|
Subject: custom_protocols_plzserviceworker.patch
|
|
|
|
Allow registering custom protocols to handle service worker main script fetching with PlzServiceWorker.
|
|
|
|
Refs https://bugs.chromium.org/p/chromium/issues/detail?id=996511
|
|
|
|
diff --git a/content/browser/service_worker/service_worker_context_wrapper.cc b/content/browser/service_worker/service_worker_context_wrapper.cc
|
|
index 32f8695df5150eda310a4150de9c2e8e2ff03b3e..74d9524af05e0a9184587ea81718c5159e53c8bf 100644
|
|
--- a/content/browser/service_worker/service_worker_context_wrapper.cc
|
|
+++ b/content/browser/service_worker/service_worker_context_wrapper.cc
|
|
@@ -2025,6 +2025,26 @@ ServiceWorkerContextWrapper::GetLoaderFactoryForBrowserInitiatedRequest(
|
|
loader_factory_bundle_info =
|
|
context()->loader_factory_bundle_for_update_check()->Clone();
|
|
|
|
+ // Give the embedder a chance to register custom schemes that can
|
|
+ // handle loading the service worker main script.
|
|
+ // Previous registration triggered by
|
|
+ // ServiceWorkerContextWrapper::CreateNonNetworkPendingURLLoaderFactoryBundleForUpdateCheck
|
|
+ // happens early on browser startup before the JS in the main process
|
|
+ // is run by the embedder.
|
|
+ auto& pending_scheme_specific_factories =
|
|
+ static_cast<blink::PendingURLLoaderFactoryBundle*>(
|
|
+ loader_factory_bundle_info.get())
|
|
+ ->pending_scheme_specific_factories();
|
|
+ ContentBrowserClient::NonNetworkURLLoaderFactoryMap non_network_factories;
|
|
+ GetContentClient()
|
|
+ ->browser()
|
|
+ ->RegisterNonNetworkServiceWorkerUpdateURLLoaderFactories(
|
|
+ storage_partition_->browser_context(), &non_network_factories);
|
|
+ for (auto& [scheme, factory_remote] : non_network_factories) {
|
|
+ pending_scheme_specific_factories.emplace(
|
|
+ scheme, std::move(factory_remote));
|
|
+ }
|
|
+
|
|
if (auto* config = content::WebUIConfigMap::GetInstance().GetConfig(
|
|
browser_context(), scope)) {
|
|
// If this is a Service Worker for a WebUI, the WebUI's URLDataSource
|
|
@@ -2044,9 +2064,7 @@ ServiceWorkerContextWrapper::GetLoaderFactoryForBrowserInitiatedRequest(
|
|
features::kEnableServiceWorkersForChromeScheme) &&
|
|
scope.scheme_piece() == kChromeUIScheme) {
|
|
config->RegisterURLDataSource(browser_context());
|
|
- static_cast<blink::PendingURLLoaderFactoryBundle*>(
|
|
- loader_factory_bundle_info.get())
|
|
- ->pending_scheme_specific_factories()
|
|
+ pending_scheme_specific_factories
|
|
.emplace(kChromeUIScheme, CreateWebUIServiceWorkerLoaderFactory(
|
|
browser_context(), kChromeUIScheme,
|
|
base::flat_set<std::string>()));
|
|
@@ -2054,9 +2072,7 @@ ServiceWorkerContextWrapper::GetLoaderFactoryForBrowserInitiatedRequest(
|
|
features::kEnableServiceWorkersForChromeUntrusted) &&
|
|
scope.scheme_piece() == kChromeUIUntrustedScheme) {
|
|
config->RegisterURLDataSource(browser_context());
|
|
- static_cast<blink::PendingURLLoaderFactoryBundle*>(
|
|
- loader_factory_bundle_info.get())
|
|
- ->pending_scheme_specific_factories()
|
|
+ pending_scheme_specific_factories
|
|
.emplace(kChromeUIUntrustedScheme,
|
|
CreateWebUIServiceWorkerLoaderFactory(
|
|
browser_context(), kChromeUIUntrustedScheme,
|