mirror of
https://github.com/electron/electron.git
synced 2026-01-08 15:13:52 -05:00
bccb7b572a
* chore: bump chromium in DEPS to 123.0.6265.0
* chore: bump chromium in DEPS to 123.0.6266.0
* chore: update feat_ensure_mas_builds_of_the_same_application_can_use_safestorage.patch
Xref: https://chromium-review.googlesource.com/c/chromium/src/+/5232280
reverts the revert *and* undoes the rewrites 😵
* chore: update chromium/disable_hidden.patch
Xref: https://chromium-review.googlesource.com/c/chromium/src/+/5148491
minor manual intervention
* chore: update patches
* chore: Rename mouse lock to pointer lock
Xref: https://chromium-review.googlesource.com/c/chromium/src/+/5148491
* refactor: fix use of newly-removed QuitCurrentWhenIdleClosureDeprecated()
Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4710351
Xref: https://github.com/electron/electron/pull/26022
This usage was added in #26022 as part of Wayland support and some
simple fiddles WfM with this patch on Wayland, but I'm unsure what
to be testing for & would like a second opinion on this commit.
* chore: bump chromium in DEPS to 123.0.6268.0
* chore: update patches
* 5235021: WebUI: Migrate accessibility and bluetooth internals to WebUIConfig
https://chromium-review.googlesource.com/c/chromium/src/+/5235021
* address review comment for 5196547
See: https://chromium-review.googlesource.com/c/chromium/src/+/5196547
Review comment: https://github.com/electron/electron/pull/41130#discussion_r1468973786
* 5075962: Introduce URLLoaderFactoryBuilder
https://chromium-review.googlesource.com/c/chromium/src/+/5075962
* chore: bump chromium in DEPS to 123.0.6270.0
* the missing semicolon strikes again
* chore: update chromium patches
* chore: update v8 patches
* 5242326: Some followup cleanup to Fuchia files in chrome | https://chromium-review.googlesource.com/c/chromium/src/+/5242326
* chore: bump chromium in DEPS to 123.0.6272.0
* chore: update patches
* chore: update patch after rebase
* 5247339: [Clipboard] Remove ClipboardContentType enum.
https://chromium-review.googlesource.com/c/chromium/src/+/5247339
* Reland: "Allow content shell to enable the built-in DNS resolver"
https://chromium-review.googlesource.com/c/chromium/src/+/5232354
* 5018206: [accessibility] Migrate to ScopedAccessibilityMode
https://chromium-review.googlesource.com/c/chromium/src/+/5018206
* 5246669: [Default Nav Transition]Add GetBackForwardTransitionAnimationManager on WebContentsView | https://chromium-review.googlesource.com/c/chromium/src/+/5246669
* fix: move nut-js to optional spec deps (#41199)
* chore: bump chromium in DEPS to 123.0.6265.0
* chore: bump chromium in DEPS to 123.0.6266.0
* chore: update feat_ensure_mas_builds_of_the_same_application_can_use_safestorage.patch
Xref: https://chromium-review.googlesource.com/c/chromium/src/+/5232280
reverts the revert *and* undoes the rewrites 😵
* chore: update chromium/disable_hidden.patch
Xref: https://chromium-review.googlesource.com/c/chromium/src/+/5148491
minor manual intervention
* chore: update patches
* chore: Rename mouse lock to pointer lock
Xref: https://chromium-review.googlesource.com/c/chromium/src/+/5148491
* refactor: fix use of newly-removed QuitCurrentWhenIdleClosureDeprecated()
Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4710351
Xref: https://github.com/electron/electron/pull/26022
This usage was added in #26022 as part of Wayland support and some
simple fiddles WfM with this patch on Wayland, but I'm unsure what
to be testing for & would like a second opinion on this commit.
* chore: bump chromium in DEPS to 123.0.6268.0
* chore: update patches
* 5235021: WebUI: Migrate accessibility and bluetooth internals to WebUIConfig
https://chromium-review.googlesource.com/c/chromium/src/+/5235021
* address review comment for 5196547
See: https://chromium-review.googlesource.com/c/chromium/src/+/5196547
Review comment: https://github.com/electron/electron/pull/41130#discussion_r1468973786
* 5075962: Introduce URLLoaderFactoryBuilder
https://chromium-review.googlesource.com/c/chromium/src/+/5075962
* chore: bump chromium in DEPS to 123.0.6270.0
* the missing semicolon strikes again
* chore: update chromium patches
* chore: update v8 patches
* 5242326: Some followup cleanup to Fuchia files in chrome | https://chromium-review.googlesource.com/c/chromium/src/+/5242326
* chore: bump chromium in DEPS to 123.0.6272.0
* chore: update patches
* chore: update patch after rebase
* 5247339: [Clipboard] Remove ClipboardContentType enum.
https://chromium-review.googlesource.com/c/chromium/src/+/5247339
* Reland: "Allow content shell to enable the built-in DNS resolver"
https://chromium-review.googlesource.com/c/chromium/src/+/5232354
* 5018206: [accessibility] Migrate to ScopedAccessibilityMode
https://chromium-review.googlesource.com/c/chromium/src/+/5018206
* 5246669: [Default Nav Transition]Add GetBackForwardTransitionAnimationManager on WebContentsView | https://chromium-review.googlesource.com/c/chromium/src/+/5246669
* fix: typescript error for optional dependency
(cherry picked from commit ea17105c8c)
---------
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: PatchUp <73610968+patchup[bot]@users.noreply.github.com>
Co-authored-by: clavin <clavin@electronjs.org>
Co-authored-by: VerteDinde <vertedinde@electronjs.org>
Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org>
Co-authored-by: Sam Maddock <smaddock@slack-corp.com>
38 lines
1.7 KiB
Diff
38 lines
1.7 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: deepak1556 <hop2deep@gmail.com>
|
|
Date: Mon, 3 Jun 2019 14:20:05 -0700
|
|
Subject: frame_host_manager.patch
|
|
|
|
Allows embedder to intercept site instances created by chromium.
|
|
|
|
diff --git a/content/browser/renderer_host/render_frame_host_manager.cc b/content/browser/renderer_host/render_frame_host_manager.cc
|
|
index 2df0ba8a8cbe4aba14f79543012c4c33ce262b2e..5236a86e64dbd2b82a56b6a8e8a9288b7b2a3d6a 100644
|
|
--- a/content/browser/renderer_host/render_frame_host_manager.cc
|
|
+++ b/content/browser/renderer_host/render_frame_host_manager.cc
|
|
@@ -4237,6 +4237,9 @@ RenderFrameHostManager::GetSiteInstanceForNavigationRequest(
|
|
request->ResetStateForSiteInstanceChange();
|
|
}
|
|
|
|
+ GetContentClient()->browser()->RegisterPendingSiteInstance(
|
|
+ render_frame_host_.get(), dest_site_instance.get());
|
|
+
|
|
return dest_site_instance;
|
|
}
|
|
|
|
diff --git a/content/public/browser/content_browser_client.h b/content/public/browser/content_browser_client.h
|
|
index b9178a001681843a6e956ba45f0b3056bf89587b..3e610a94da7771d0b5ab743048714128f9ea33a7 100644
|
|
--- a/content/public/browser/content_browser_client.h
|
|
+++ b/content/public/browser/content_browser_client.h
|
|
@@ -298,6 +298,11 @@ class CONTENT_EXPORT ContentBrowserClient {
|
|
|
|
virtual ~ContentBrowserClient() = default;
|
|
|
|
+ // Electron: Registers a pending site instance during a navigation.
|
|
+ virtual void RegisterPendingSiteInstance(
|
|
+ content::RenderFrameHost* rfh,
|
|
+ content::SiteInstance* pending_site_instance) {}
|
|
+
|
|
// Allows the embedder to set any number of custom BrowserMainParts
|
|
// implementations for the browser startup code. See comments in
|
|
// browser_main_parts.h.
|