build: move libcc patches to electron repo (#14104)
In the GN build, libchromiumcontent is no longer a distinct library, but merely a container for a set of scripts and patches. Maintaining those patches in a separate repository is tedious and error-prone, so merge them into the main repo. Once this is merged and GN is the default way to build Electron, the libchromiumcontent repository can be archived.
This commit is contained in:
parent
9e85bdb02c
commit
76c5f5cc8a
147 changed files with 86931 additions and 6 deletions
83
patches/common/chromium/frame_host_manager.patch
Normal file
83
patches/common/chromium/frame_host_manager.patch
Normal file
|
@ -0,0 +1,83 @@
|
|||
diff --git a/content/browser/frame_host/render_frame_host_manager.cc b/content/browser/frame_host/render_frame_host_manager.cc
|
||||
index e6f6b3012b02..965b58e237ec 100644
|
||||
--- a/content/browser/frame_host/render_frame_host_manager.cc
|
||||
+++ b/content/browser/frame_host/render_frame_host_manager.cc
|
||||
@@ -1834,6 +1834,18 @@ RenderFrameHostManager::GetSiteInstanceForNavigationRequest(
|
||||
bool was_server_redirect = request.navigation_handle() &&
|
||||
request.navigation_handle()->WasServerRedirect();
|
||||
|
||||
+ BrowserContext* browser_context =
|
||||
+ delegate_->GetControllerForRenderManager().GetBrowserContext();
|
||||
+ // If the navigation can swap SiteInstances, compute the SiteInstance it
|
||||
+ // should use.
|
||||
+ // TODO(clamy): We should also consider as a candidate SiteInstance the
|
||||
+ // speculative SiteInstance that was computed on redirects.
|
||||
+ scoped_refptr<SiteInstance> candidate_site_instance =
|
||||
+ speculative_render_frame_host_
|
||||
+ ? speculative_render_frame_host_->GetSiteInstance()
|
||||
+ : content::SiteInstance::CreateForURL(browser_context,
|
||||
+ request.common_params().url);
|
||||
+
|
||||
if (frame_tree_node_->IsMainFrame()) {
|
||||
// Renderer-initiated main frame navigations that may require a
|
||||
// SiteInstance swap are sent to the browser via the OpenURL IPC and are
|
||||
@@ -1850,6 +1862,19 @@ RenderFrameHostManager::GetSiteInstanceForNavigationRequest(
|
||||
|
||||
no_renderer_swap_allowed |=
|
||||
request.from_begin_navigation() && !can_renderer_initiate_transfer;
|
||||
+
|
||||
+ bool has_response_started =
|
||||
+ (request.state() == NavigationRequest::RESPONSE_STARTED ||
|
||||
+ request.state() == NavigationRequest::FAILED) &&
|
||||
+ !speculative_render_frame_host_;
|
||||
+ // Gives user a chance to choose a custom site instance.
|
||||
+ SiteInstance* client_custom_instance = nullptr;
|
||||
+ GetContentClient()->browser()->OverrideSiteInstanceForNavigation(
|
||||
+ render_frame_host_.get(), browser_context, request.common_params().url,
|
||||
+ has_response_started, candidate_site_instance.get(),
|
||||
+ &client_custom_instance);
|
||||
+ if (client_custom_instance)
|
||||
+ return scoped_refptr<SiteInstance>(client_custom_instance);
|
||||
} else {
|
||||
// Subframe navigations will use the current renderer, unless specifically
|
||||
// allowed to swap processes.
|
||||
@@ -1861,18 +1886,9 @@ RenderFrameHostManager::GetSiteInstanceForNavigationRequest(
|
||||
if (no_renderer_swap_allowed)
|
||||
return scoped_refptr<SiteInstance>(current_site_instance);
|
||||
|
||||
- // If the navigation can swap SiteInstances, compute the SiteInstance it
|
||||
- // should use.
|
||||
- // TODO(clamy): We should also consider as a candidate SiteInstance the
|
||||
- // speculative SiteInstance that was computed on redirects.
|
||||
- SiteInstance* candidate_site_instance =
|
||||
- speculative_render_frame_host_
|
||||
- ? speculative_render_frame_host_->GetSiteInstance()
|
||||
- : nullptr;
|
||||
-
|
||||
scoped_refptr<SiteInstance> dest_site_instance = GetSiteInstanceForNavigation(
|
||||
request.common_params().url, request.source_site_instance(),
|
||||
- request.dest_site_instance(), candidate_site_instance,
|
||||
+ request.dest_site_instance(), candidate_site_instance.get(),
|
||||
request.common_params().transition,
|
||||
request.restore_type() != RestoreType::NONE, request.is_view_source(),
|
||||
was_server_redirect);
|
||||
diff --git a/content/public/browser/content_browser_client.h b/content/public/browser/content_browser_client.h
|
||||
index 746760e8596c..99d9e0770f32 100644
|
||||
--- a/content/public/browser/content_browser_client.h
|
||||
+++ b/content/public/browser/content_browser_client.h
|
||||
@@ -181,6 +181,15 @@ class CONTENT_EXPORT ContentBrowserClient {
|
||||
public:
|
||||
virtual ~ContentBrowserClient() {}
|
||||
|
||||
+ // Electron: Allows overriding the SiteInstance when navigating.
|
||||
+ virtual void OverrideSiteInstanceForNavigation(
|
||||
+ RenderFrameHost* render_frame_host,
|
||||
+ BrowserContext* browser_context,
|
||||
+ const GURL& dest_url,
|
||||
+ bool has_response_started,
|
||||
+ SiteInstance* candidate_site_instance,
|
||||
+ SiteInstance** new_instance) {}
|
||||
+
|
||||
// Allows the embedder to set any number of custom BrowserMainParts
|
||||
// implementations for the browser startup code. See comments in
|
||||
// browser_main_parts.h.
|
Loading…
Add table
Add a link
Reference in a new issue