mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

chore: bump chromium to 74.0.3729.27 (master) (#17345)

Browse source 
* chore: bump chromium to 74.0.3729.5 (master)

* Remove ScopedBlockingCall constructor without location

1496560

* Use XCode 9.4.1 for Mac SDK 10.13

* chore: roll chromium 74.0.3729.27
This commit is contained in:
Jeremy Apthorp 2019-03-21 08:45:22 -07:00 • committed by John Kleinschmidt
parent 07b02653ba
commit 6555be2636
48 changed files with 170 additions and 255 deletions
Download patch file Download diff file Expand all files Collapse all files

12
patches/common/chromium/frame_host_manager.patch
View file

@ -7,10 +7,10 @@ Allows embedder to intercept site instances chosen by chromium
and respond with custom instance.
diff --git a/content/browser/frame_host/render_frame_host_manager.cc b/content/browser/frame_host/render_frame_host_manager.cc
index 9d8a7f4c2a1f671828b17ce0a6d49527ea49373e..e4e347d1c0de7d7263f76104a668693fce8dec9b 100644
index cc7c7b4ffab5377fa71016e233fbfaae87d50329..81a351569528e74fa44e68a804de968bc3a08742 100644
--- a/content/browser/frame_host/render_frame_host_manager.cc
+++ b/content/browser/frame_host/render_frame_host_manager.cc
@@ -2031,6 +2031,16 @@ bool RenderFrameHostManager::InitRenderView(
@@ -2030,6 +2030,16 @@ bool RenderFrameHostManager::InitRenderView(
scoped_refptr<SiteInstance>
RenderFrameHostManager::GetSiteInstanceForNavigationRequest(
const NavigationRequest& request) {
@ -27,7 +27,7 @@ index 9d8a7f4c2a1f671828b17ce0a6d49527ea49373e..e4e347d1c0de7d7263f76104a668693f
// First, check if the navigation can switch SiteInstances. If not, the
// navigation should use the current SiteInstance.
SiteInstance* current_site_instance = render_frame_host_->GetSiteInstance();
@@ -2063,6 +2073,51 @@ RenderFrameHostManager::GetSiteInstanceForNavigationRequest(
@@ -2062,6 +2072,51 @@ RenderFrameHostManager::GetSiteInstanceForNavigationRequest(
request.common_params().url);
no_renderer_swap_allowed |=
request.from_begin_navigation() && !can_renderer_initiate_transfer;
@ -79,7 +79,7 @@ index 9d8a7f4c2a1f671828b17ce0a6d49527ea49373e..e4e347d1c0de7d7263f76104a668693f
} else {
// Subframe navigations will use the current renderer, unless specifically
// allowed to swap processes.
@@ -2074,23 +2129,17 @@ RenderFrameHostManager::GetSiteInstanceForNavigationRequest(
@@ -2073,23 +2128,17 @@ RenderFrameHostManager::GetSiteInstanceForNavigationRequest(
if (no_renderer_swap_allowed && !should_swap_for_error_isolation)
return scoped_refptr<SiteInstance>(current_site_instance);
@ -108,7 +108,7 @@ index 9d8a7f4c2a1f671828b17ce0a6d49527ea49373e..e4e347d1c0de7d7263f76104a668693f
}
diff --git a/content/public/browser/content_browser_client.cc b/content/public/browser/content_browser_client.cc
index b6c528126bde8c7ee8cdf8440ae51cfe1a742b9a..8a4f94786e75c7abecd1a53fd6f0c2c0421534db 100644
index 798a62cbb030514ce2373f898d9680ceda7b9062..337bb0ed74b3efe7ae0bcb6ea8ef662becb0cabd 100644
--- a/content/public/browser/content_browser_client.cc
+++ b/content/public/browser/content_browser_client.cc
@@ -51,6 +51,16 @@ void OverrideOnBindInterface(const service_manager::BindSourceInfo& remote_info,
@ -129,7 +129,7 @@ index b6c528126bde8c7ee8cdf8440ae51cfe1a742b9a..8a4f94786e75c7abecd1a53fd6f0c2c0
const MainFunctionParams& parameters) {
return nullptr;
diff --git a/content/public/browser/content_browser_client.h b/content/public/browser/content_browser_client.h
index 72944bc96a2ec71be1b20fa68e7994445f225824..bbc4263798a4cf13c0a6f3d7d62f01eb1dfe4784 100644
index 5a6d3cbf0a913f56a789ac1166d850eb29332a78..3dfe4abcc76b88580d818ea1bd61a0e32c0af882 100644
--- a/content/public/browser/content_browser_client.h
+++ b/content/public/browser/content_browser_client.h
@@ -210,8 +210,37 @@ CONTENT_EXPORT void OverrideOnBindInterface(