8de0bb5bc3
* chore: bump chromium in DEPS to 138.0.7166.0 Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> * chore: bump chromium in DEPS to 138.0.7166.2 Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> * 6508373: Add WebContents, Tab getters for future Clank navigation capture rework6508373Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com> * 6470924: Introduce auto-populated Search Engine icons.6470924Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com> * 6502977: Force same tab navigation while actor coordinator is acting on a tab6502977Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com> * chore: bump chromium in DEPS to 138.0.7168.0 Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> * chore: update patches Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org> * fix grit patch Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com> * chore: bump Chromium to 138.0.7169.2 Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com> * fixup! 6508373: Add WebContents, Tab getters for future Clank navigation capture rework Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com> * 6493688: NavigationThrottleRunner2: void CreateThrottlesForNavigation6493688Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com> * 6488755: Reland "WebSQL: Remove WebPreference"6488755Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com> * 6428707: FSA: Only normalize the hardcoded rules once during initialization6428707Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com> * chore: fixup patch indices Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com> * chore: bump chromium in DEPS to 138.0.7170.0 Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> * 6514121: Remove origin calculation debug info and related methods6514121Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com> * chore: bump chromium in DEPS to 138.0.7172.0 Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> * chore: bump chromium in DEPS to 138.0.7173.0 Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> * chore: bump chromium in DEPS to 138.0.7175.0 Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> * fixup! 6514121: Remove origin calculation debug info and related methods Refs6514121Co-authored-by: David Sanders <dsanders11@ucsbalum.com> * 6531585: Don't retry LayerTreeSink creation on the high priority queue Refs6531585Co-authored-by: David Sanders <dsanders11@ucsbalum.com> * 6512253: Modernize base::apple's base bundle ID Refs6512253Co-authored-by: David Sanders <dsanders11@ucsbalum.com> * fixup! 6428707: FSA: Only normalize the hardcoded rules once during initialization Refs6428707Co-authored-by: David Sanders <dsanders11@ucsbalum.com> * fixup! 6508373: Add WebContents, Tab getters for future Clank navigation capture rework Refs6508373Co-authored-by: David Sanders <dsanders11@ucsbalum.com> * chore: update patches Co-authored-by: David Sanders <dsanders11@ucsbalum.com> * chore: update patches --------- 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> Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com> Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org> Co-authored-by: David Sanders <dsanders11@ucsbalum.com>
37 lines
1.7 KiB
Diff
37 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 a8eea524f693c4f15c08e1c2f48b13c97d28ce75..47e0b121ced6ea129ccffe6364c5a91f826036eb 100644
|
|
--- a/content/browser/renderer_host/render_frame_host_manager.cc
|
|
+++ b/content/browser/renderer_host/render_frame_host_manager.cc
|
|
@@ -4714,6 +4714,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 17b11b2a4e70f419721649568179c31228612c73..e094c512f71eef3714ed0dd6090fd6c5efab3063 100644
|
|
--- a/content/public/browser/content_browser_client.h
|
|
+++ b/content/public/browser/content_browser_client.h
|
|
@@ -342,6 +342,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.
|