mirror of
https://github.com/electron/electron.git
synced 2026-04-10 03:01:51 -04:00
1fffaeb481
chore: bump chromium to 148.0.7733.0 42-x-y * 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: trop[bot] <37223003+trop[bot]@users.noreply.github.com> Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.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 a5165a08f161844898281c18d3963f8abffd58a8..c4d995aec772a6818c747adceb9fc63fe8d272e2 100644
|
|
--- a/content/browser/renderer_host/render_frame_host_manager.cc
|
|
+++ b/content/browser/renderer_host/render_frame_host_manager.cc
|
|
@@ -4925,6 +4925,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 e6f51d39b4f2f6b162814996921958ca1252e1d7..1f496db16389734a30f1c07903ff6225aeb1f1b4 100644
|
|
--- a/content/public/browser/content_browser_client.h
|
|
+++ b/content/public/browser/content_browser_client.h
|
|
@@ -350,6 +350,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.
|