mirror of
https://github.com/electron/electron.git
synced 2026-04-10 03:01:51 -04:00
* chore: bump chromium in DEPS to 122.0.6240.1 * chore: bump chromium in DEPS to 122.0.6241.6 * chore: bump chromium in DEPS to 122.0.6245.1 * chore: bump chromium in DEPS to 122.0.6247.1 * chore: bump chromium in DEPS to 122.0.6249.1 * chore: bump chromium in DEPS to 122.0.6251.1 * chore: bump chromium in DEPS to 122.0.6253.1 * chore: bump chromium in DEPS to 122.0.6255.1 * chore: bump chromium in DEPS to 122.0.6257.1 * chore: bump chromium in DEPS to 122.0.6259.1 * chore: bump chromium in DEPS to 122.0.6259.3 * chore: bump chromium in DEPS to 122.0.6259.5 * chore: bump chromium in DEPS to 122.0.6260.0 * chore: bump chromium in DEPS to 122.0.6261.1 * chore: bump chromium in DEPS to 122.0.6261.6 * chore: update patches (cherry picked from commitdde66c3589) * refactor: extensions replaced StringPiece with string_view Ref: https://chromium-review.googlesource.com/c/chromium/src/+/5171926 (cherry picked from commitc7031d5c05) * chore: update patches (cherry picked from commit95b04b1fca) * 5192010: Rename {absl => std}::optional in //chrome/ https://chromium-review.googlesource.com/c/chromium/src/+/5192010 (cherry picked from commit55e5867614) * 5109767: CodeHealth: Fix leaked raw_ptr in Linux ProcessSingleton https://chromium-review.googlesource.com/c/chromium/src/+/5109767 (cherry picked from commit7b2efc7586) * 5105227: [media_preview] Show requested device in permission bubble https://chromium-review.googlesource.com/c/chromium/src/+/5105227 (cherry picked from commit10d61636c6) * chore: update patches (cherry picked from commitd04ebc7b07) * 5180720: Polish tiled browser window UI on Linux | https://chromium-review.googlesource.com/c/chromium/src/+/5180720 (cherry picked from commit3dbbb67dbc) * chore: update patches (cherry picked from commit18a5961e4e) * chore: update patches (cherry picked from commit69e0bfefcc) * 5186276: [autopip] Make "allow once" per navigation | https://chromium-review.googlesource.com/c/chromium/src/+/5186276 (cherry picked from commit412f70681a) * chore: update patches (cherry picked from commite4d2a2ded0) * 5190661: Automated T* -> raw_ptr<T> rewrite "refresh" | https://chromium-review.googlesource.com/c/chromium/src/+/5190661 (cherry picked from commit6b41b72130) * 5206106: Make sure RenderFrameHosts are active when printing | https://chromium-review.googlesource.com/c/chromium/src/+/5206106 (cherry picked from commit9a788c0c60) * 5202674: Reland "Automated T* -> raw_ptr<T> rewrite 'refresh'" https://chromium-review.googlesource.com/c/chromium/src/+/5202674 (cherry picked from commit55daca952d) * fixup CodeHealth: Fix leaked raw_ptr in Linux ProcessSingleton https://chromium-review.googlesource.com/c/chromium/src/+/5109767 (cherry picked from commit047898ba92) * fixup 5206106: Make sure RenderFrameHosts are active when printing (cherry picked from commit715c534cd8) * Make legacy ToV8() helpers private to ScriptPromiseResolver, their only user https://chromium-review.googlesource.com/c/chromium/src/+/5207474 (cherry picked from commit9a10062d8c) * fixup CodeHealth: Fix leaked raw_ptr in Linux ProcessSingleton (cherry picked from commita1f643b25e) * fixup 5186276: [autopip] Make "allow once" per navigation https://chromium-review.googlesource.com/c/chromium/src/+/5186276 (cherry picked from commite3c40ed923) * 5191363: Mark LOG(FATAL) [[noreturn]] https://chromium-review.googlesource.com/c/chromium/src/+/5191363 (cherry picked from commit8037cef988) * fixup 5186276: [autopip] Make "allow once" per navigation https://chromium-review.googlesource.com/c/chromium/src/+/5186276 (cherry picked from commite60c31dd4f) * fixup Make legacy ToV8() helpers private to ScriptPromiseResolver https://chromium-review.googlesource.com/c/chromium/src/+/5207474 (cherry picked from commitb02108e0c0) * chore: update patches (cherry picked from commit96e8574115) * chore: update patches (cherry picked from commite0f51957be) * chore: restore patch that was mistakenly removed (cherry picked from commit4057b5439c) * 5181931: Improve LoginHandler (Part 9 / N) https://chromium-review.googlesource.com/c/chromium/src/+/5181931 (cherry picked from commit6ad8028fe8) * Dispatch SiteInstanceGotProcess() only when both process and site are set. https://chromium-review.googlesource.com/c/chromium/src/+/5142354 (cherry picked from commita871198a23) * 5171446: [AsyncSB] Pass navigation_id into CreateURLLoaderThrottles https://chromium-review.googlesource.com/c/chromium/src/+/5171446 (cherry picked from commitebf2efcedd) * 5213708: Move DownloadTargetInfo into components/download https://chromium-review.googlesource.com/c/chromium/src/+/5213708 (cherry picked from commitc361ded147) * extensions: Add a loader for Controlled Frame embedder scripts https://chromium-review.googlesource.com/c/chromium/src/+/5202765 (cherry picked from commit63d2773d15) * [CSC][Zoom] Add initial_zoom_level to DisplayMediaInformation https://chromium-review.googlesource.com/c/chromium/src/+/5168626 (cherry picked from commita4b5c9ce31) * fix: suppress clang -Wimplicit-const-int-float-conversion (cherry picked from commit979bde6683) * fixup 5191363: Mark LOG(FATAL) [[noreturn]] for Windows https://chromium-review.googlesource.com/c/chromium/src/+/5191363 (cherry picked from commit759f1740a8) * 5167921: Remove Widget::IsTranslucentWindowOpacitySupported https://chromium-review.googlesource.com/c/chromium/src/+/5167921 Also 5148392: PinnedState: Support pinned state in PlatformWindowState | https://chromium-review.googlesource.com/c/chromium/src/+/5148392 (cherry picked from commit53d9c82a57) * fixup: 5180720: Polish tiled browser window UI on Linux https://chromium-review.googlesource.com/c/chromium/src/+/5180720 (cherry picked from commite565db5095) * 5170669: clipboard: Migrate DOMException constructors to RejectWith- https://chromium-review.googlesource.com/c/chromium/src/+/5170669 (cherry picked from commit5409118134) * 5178824: [Fullscreen] Record UKM data https://chromium-review.googlesource.com/c/chromium/src/+/5178824 (cherry picked from commit3d53a6ec01) * chore: update patches after rebase (cherry picked from commit3a6a335a05) * chore: update patches after cherry picks * chore: update patches after rebase --------- Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: Samuel Attard <samuel.r.attard@gmail.com> Co-authored-by: PatchUp <73610968+patchup[bot]@users.noreply.github.com> Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com> Co-authored-by: VerteDinde <vertedinde@electronjs.org> Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org>
63 lines
3.4 KiB
Diff
63 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 c0ece46d3a4b380c6fc2764bf49344153653bcf2..3bffada8ba3f378d4c5a5b75d7f1bb9da5437a1f 100644
|
|
--- a/content/browser/service_worker/service_worker_context_wrapper.cc
|
|
+++ b/content/browser/service_worker/service_worker_context_wrapper.cc
|
|
@@ -1922,6 +1922,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
|
|
@@ -1941,9 +1961,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>()));
|
|
@@ -1951,9 +1969,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,
|