mirror of
https://github.com/electron/electron.git
synced 2026-04-10 03:01:51 -04:00
e5d3fbf6dc
* chore: bump chromium in DEPS to 147.0.7693.0 * chore: bump chromium in DEPS to 147.0.7694.0 * chore: bump chromium in DEPS to 147.0.7695.0 * chore: bump chromium in DEPS to 147.0.7697.0 * chore: bump chromium in DEPS to 147.0.7698.0 * fix(patch): IsGuest moved to SecurityPrincipal Ref: https://chromium-review.googlesource.com/c/chromium/src/+/7234613 Co-Authored-By: Claude (claude-opus-4-6) * chore: update patches (trivial only) * fix(patch): v8::External API now requires ExternalPointerTypeTag Ref: https://chromium-review.googlesource.com/c/v8/v8/+/7562476 Co-Authored-By: Claude (claude-opus-4-6) * fix: update CreateCustomWebContents signature Upstream added disposition and window_features parameters. Ref: https://chromium-review.googlesource.com/c/chromium/src/+/7585256 Co-Authored-By: Claude (claude-opus-4-6) * fix: OriginatingProcess renamed to OriginatingProcessId Ref: https://chromium-review.googlesource.com/c/chromium/src/+/7557820 Co-Authored-By: Claude (claude-opus-4-6) * fix: kLogNetLog moved from network::switches to net::switches Ref: https://chromium-review.googlesource.com/c/chromium/src/+/7559090 Co-Authored-By: Claude (claude-opus-4-6) * fix(patch): patch out glic and save-to-drive Profile usage in PDF Ref: https://chromium-review.googlesource.com/c/chromium/src/+/7589312 Co-Authored-By: Claude (claude-opus-4-6) * chore: bump chromium in DEPS to 147.0.7699.0 * chore: remove upstreamed pseudonymization salt descriptor code Ref: https://chromium-review.googlesource.com/c/chromium/src/+/7568382 Co-Authored-By: Claude (claude-opus-4-6) * chore: update patches (trivial only) * chore: update reclient patch format (copy-from to new-file) Co-Authored-By: Claude (claude-opus-4-6) * chore: remove upstreamed patch and update stale patches Co-Authored-By: Claude (claude-opus-4-6) * fix: expose GetLibGdk3 and guard glic function body GetLibGdk3 needs to be public for Electron's gdk_display_beep usage. ShouldShowGlicSummarizeButton body must be guarded, not just call site. Co-Authored-By: Claude (claude-opus-4-6) * fix(patch): v8::External API in nan requires ExternalPointerTypeTag Ref: https://chromium-review.googlesource.com/c/v8/v8/+/7562476 Co-Authored-By: Claude (claude-opus-4-6) * fixup fix(patch): v8::External API in nan requires ExternalPointerTypeTag * fixup: remove extraneous changes to patches Caused bydebb3716816e51034728* fixup: revert fix: expose GetLibGdk3 and guard glic function body Reverts6e51034728as this was an unneeded changed caused by the incorrect changes made indebb371681* 7586673: Update logic for showing pdf summarize button 7586673: Update logic for showing pdf summarize button | https://chromium-review.googlesource.com/c/chromium/src/+/7586673 Also 7454131: set enable_glic=true | https://chromium-review.googlesource.com/c/chromium/src/+/7454131 (landed in previous roll) --------- Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: Alice Zhao <alicelovescake@anthropic.com> Co-authored-by: John Kleinschmidt <kleinschmidtorama@gmail.com>
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 6436665d3084164ebe3ac2896c462360558a8d74..78a0b8b71f4fc31798bcb1dc89fe10480f19967b 100644
|
|
--- a/content/browser/service_worker/service_worker_context_wrapper.cc
|
|
+++ b/content/browser/service_worker/service_worker_context_wrapper.cc
|
|
@@ -1941,6 +1941,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
|
|
@@ -1960,9 +1980,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>()));
|
|
@@ -1970,9 +1988,7 @@ ServiceWorkerContextWrapper::GetLoaderFactoryForBrowserInitiatedRequest(
|
|
features::kEnableServiceWorkersForChromeUntrusted) &&
|
|
scope.scheme() == 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,
|