mirror of
https://github.com/electron/electron.git
synced 2026-04-10 03:01:51 -04:00
36b0709942
* chore: bump chromium in DEPS to 147.0.7727.2 * chore: bump chromium in DEPS to 148.0.7728.0 * chore: bump chromium in DEPS to 148.0.7729.0 * chore: bump chromium in DEPS to 148.0.7730.0 * chore: bump chromium in DEPS to 148.0.7732.0 * chore: update WrappablePointerTag patch Refs https://chromium-review.googlesource.com/c/chromium/src/+/7641766 * chore: update custom protocol patch for removed code Refs https://chromium-review.googlesource.com/c/chromium/src/+/7653454 * chore: update patches * fix: cleanup removed CHILD_PLUGIN code Refs https://chromium-review.googlesource.com/c/chromium/src/+/7653455 * fix: move from int to ChildProcessId Refs https://chromium-review.googlesource.com/c/chromium/src/+/7621912 * fix: update extensions CreateTab signature Refs https://chromium-review.googlesource.com/c/chromium/src/+/7644389 * fix: draggable hit region test interface update for mac windows Refs https://chromium-review.googlesource.com/c/chromium/src/+/7655245 * chore: bump chromium in DEPS to 148.0.7733.0 * feat: restore macos child plugin process Refs https://chromium-review.googlesource.com/c/chromium/src/+/7653455 * fixup! chore: merge main * chore: update patches * fix: replace clipboard IsFormatAvailable with async GetAllAvailableFormats Refs https://chromium-review.googlesource.com/c/chromium/src/+/7631097 Async API pending RFC https://github.com/electron/rfcs/pull/19 --------- Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: Samuel Maddock <samuelmaddock@electronjs.org>
52 lines
2.7 KiB
Diff
52 lines
2.7 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 59b61e92921c2a21ec6d0d98fecc27cb2465d917..a527eb1558a070361285070e047587a122423654 100644
|
|
--- a/content/browser/service_worker/service_worker_context_wrapper.cc
|
|
+++ b/content/browser/service_worker/service_worker_context_wrapper.cc
|
|
@@ -1958,6 +1958,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
|
|
@@ -1977,9 +1997,7 @@ ServiceWorkerContextWrapper::GetLoaderFactoryForBrowserInitiatedRequest(
|
|
features::kEnableServiceWorkersForChromeScheme) &&
|
|
scope.scheme() == 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>()));
|