75eac86506
* chore: bump chromium in DEPS to 134.0.6948.0 * chore: update can_create_window.patch6151982no patch code changes, but had to manually apply due to upstream context shear * chore: update proxy_config_monitor.patch no manual changes; patch applied with fuzz 2 Xref:6126219* chore: update build_add_electron_tracing_category.patch Xref:6149256* chore: update adjust_accessibility_ui_for_electron.patch6105650no patch code changes, but had to manually apply due to upstream context shear * chore: e patches all * chore: use fully-qualified path for all.gn Xref:6154997* chore: do not use a variable when assigning rtc_use_h264 Xref:6154997* Move GlobalShortcutListenerLinux to //ui/base Xref:6097375* [MPArch Guest View] Make WebPreferences queried per frame tree root Xref:6096390* [Status Icons] Allow vector resources6139403* [Extensions] Move MatchOriginAsFallbackBehavior to Mojom Xref:6141793* Remove StrongAlias::Hasher Xref:6132291* Rename text-change and select-change methods and related stuff Xref:6148816* [Code Health] Remove stale feature EnableWebUsbOnExtensionServiceWorker6115161* [Extensions Cleanup] Move creation of tab-based ports to factory method6143725* refactor: add StatusIconGtk::SetIcon() Xref:6139403copied from chrome/browser/status_icons/status_icon.cc * refactor: add TrayIconLinux::GetIcon() Xref:6139403* chore: update feat_allow_usage_of_sccontentsharingpicker_on_supported_platforms.patch remove unused filter_ field * chore: bump chromium in DEPS to 134.0.6950.0 * chore: bump chromium in DEPS to 134.0.6952.0 * chore: bump chromium in DEPS to 134.0.6954.0 * chore: bump chromium in DEPS to 134.0.6956.0 * chore: update Chromium patches * 6165749: Check scanout support in RenderableGpuMemoryBufferPool |6165749* 6106730: [Win] Use DXGI swapchains and DCOMP visuals in software mode |6106730* chore: update patches * chore: bump chromium in DEPS to 134.0.6958.0 * chore: bump chromium in DEPS to 134.0.6960.0 * chore: update chromium patches * 6168371: Remove extensions GlobalShortcutListener wrapper |6168371* chore: update patches * 6161637: WebUI: Leverage build_webui() in chrome://translate-internals |6161637* chore: bump chromium in DEPS to 134.0.6962.0 * 6177329: Remove policy.used_policy_certificates pref on ChromeOS |6177329* 6180524: Simplify logic in components/os_crypt/sync/BUILD.gn |6180524* 6144831: Enforce --disallow-v8-feature-flag-overrides in the renderer |6144831* chore: update patches * chore: bump chromium in DEPS to 134.0.6964.0 * 6181010: Ensure busy cursor does not show via LaunchWithoutSandbox |6181010* chore: update patches * chore: bump chromium in DEPS to 134.0.6966.0 * 6180598: [api] Remove Reallocate |6180598* 6170781: [Refactor] Move UninstallExtension to ExtensionRegistrar. |6170781* chore: update filenames.libcxx.gni * 6168207: cdm: Remove widevine_cdm_version.h |6168207* chore: bump chromium in DEPS to 134.0.6968.0 * 6030552: [macOS] Allow using vibrancy with NativeWidgetNSWindowBridge |6030552* fix: use explicit copy to replace realloc impl6180598https://issues.chromium.org/issues/331326406 As per recommendation, "File an issue with Node to explicitly copy,because they copy under the hood anyway" * fixup! 6106730: [Win] Use DXGI swapchains and DCOMP visuals in software mode |6106730* fix: undefine win32 StrCat6172292* fix: //device/vr:directx_helpers breaking the build6064548Upstreamed in6186102* fix: avoid calling ui::Layer::SetFillsBoundsOpaquely6175787The layer opacity is determined by the background color's alpha value * fix: build with proprietary_codecs The explicit setting of rtc_use_h264 is no longer needed since https://webrtc-review.googlesource.com/c/src/+/62380 * fix: increase empty trace file size threshold6176642Traces now contain a net-constants property to allow them to be converted to a net log. These contain ~1240 new properties with formatted JSON data. * fix: node tests missing resource management globals6174695* fixup! fix: use explicit copy to replace realloc impl * chore: disable focus handling test due to win32/ia32 regression --------- Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: Charles Kerr <charles@charleskerr.com> Co-authored-by: Keeley Hammond <khammond@slack-corp.com> Co-authored-by: VerteDinde <vertedinde@electronjs.org> Co-authored-by: Samuel Maddock <smaddock@slack-corp.com> Co-authored-by: Samuel Maddock <samuelmaddock@electronjs.org>
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 5d096402b44d0684ed861fee090f87177fa1ffb5..6feb46048f45271e72ff1137c33c4073d101f646 100644
|
|
--- a/content/browser/service_worker/service_worker_context_wrapper.cc
|
|
+++ b/content/browser/service_worker/service_worker_context_wrapper.cc
|
|
@@ -1964,6 +1964,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
|
|
@@ -1983,9 +2003,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>()));
|
|
@@ -1993,9 +2011,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,
|