mirror of
https://github.com/electron/electron.git
synced 2026-04-10 03:01:51 -04:00
a06b49aca1
* chore: bump chromium in DEPS to 148.0.7755.0 * chore: bump chromium in DEPS to 148.0.7756.0 * chore: update patches * 7698536: Wire up experiment arms for Glic summarize pdf button. Refs https://chromium-review.googlesource.com/c/chromium/src/+/7698536 * 7695602: Include gperf to sources for iOS builds Refs https://chromium-review.googlesource.com/c/chromium/src/+/7695602 * 7671200: Expose IgnoreDuplicateNavs in WebView Refs https://chromium-review.googlesource.com/c/chromium/src/+/7671200 * chore: bump chromium in DEPS to 148.0.7758.0 * chore: update patches * 7701873: Allow running completion callbacks directly in CommitPresentedFrameToCA() on Mac Refs https://chromium-review.googlesource.com/c/chromium/src/+/7701873 * 7697732: Enhance diagnostic logging for ScreenCaptureKit errors on macOS Refs https://chromium-review.googlesource.com/c/chromium/src/+/7697732 * 7698176: Disallow cookies with empty name and ambiguous value Refs https://chromium-review.googlesource.com/c/chromium/src/+/7698176 * 7607319: Code Health: Use span in base::HexEncode Refs https://chromium-review.googlesource.com/c/chromium/src/+/7607319 * chore: bump chromium in DEPS to 148.0.7759.0 * chore: update patches * 7696478: [extensions] Move StreamContainer to extensions/browser/mime_handler/ Refs https://chromium-review.googlesource.com/c/chromium/src/+/7696478 * 7656748: Fixed controlled frame fullscreen crash Refs https://chromium-review.googlesource.com/c/chromium/src/+/7656748 * chore: update patches * fixup! 7696478: [extensions] Move StreamContainer to extensions/browser/mime_handler/ --------- Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: David Sanders <dsanders11@ucsbalum.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 ae9db54b624893f8876c5ddf0e0179fbb78431aa..83508e07b43a8734981cee9c6cd51fc33037c968 100644
|
|
--- a/content/browser/renderer_host/render_frame_host_manager.cc
|
|
+++ b/content/browser/renderer_host/render_frame_host_manager.cc
|
|
@@ -4870,6 +4870,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 f6ceaf652707d355780d8009339a42bbc271bd07..22699ec734293d1a6da22868bf5701fab1ab3fe7 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.
|