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

chore: bump chromium to bf3f97675b5d9eade34526ebf730c (master) (#27305)

Browse source 
Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com>
This commit is contained in:
Electron Bot 2021-01-25 08:46:00 -08:00 • committed by GitHub
parent 1023988ea8
commit ed126eced4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
55 changed files with 245 additions and 230 deletions
Download patch file Download diff file Expand all files Collapse all files

26
patches/chromium/frame_host_manager.patch
View file

@ -42,10 +42,10 @@ index 65e627f2fa89352b0be27b5813d71a622bf1d326..113f4fd00f1cf994b39f64c9da387855
// another SiteInstance for the same site.
void RegisterSiteInstance(SiteInstanceImpl* site_instance);
diff --git a/content/browser/renderer_host/navigation_request.cc b/content/browser/renderer_host/navigation_request.cc
index 6c29eb162f68f505ed3bb2e85c4f60ecda58f708..48b1383423c82bcd65f09d312a1d385123cef2ce 100644
index 73a069bfa7e27c1cd8c5037237028d61d6c0716d..e5cf0906ed7e293665bddc991e40dad491eb61fa 100644
--- a/content/browser/renderer_host/navigation_request.cc
+++ b/content/browser/renderer_host/navigation_request.cc
@@ -1468,6 +1468,21 @@ void NavigationRequest::BeginNavigation() {
@@ -1490,6 +1490,21 @@ void NavigationRequest::BeginNavigation() {
if (IsSameDocument()) {
render_frame_host_ = frame_tree_node_->current_frame_host();
} else {
@ -67,7 +67,7 @@ index 6c29eb162f68f505ed3bb2e85c4f60ecda58f708..48b1383423c82bcd65f09d312a1d3851
// Select an appropriate RenderFrameHost.
std::string frame_host_choice_reason;
render_frame_host_ =
@@ -5303,6 +5318,7 @@ void NavigationRequest::CheckStateTransition(NavigationState state) const {
@@ -5338,6 +5353,7 @@ void NavigationRequest::CheckStateTransition(NavigationState state) const {
{WILL_START_REQUEST, {
WILL_REDIRECT_REQUEST,
WILL_PROCESS_RESPONSE,
@ -75,7 +75,7 @@ index 6c29eb162f68f505ed3bb2e85c4f60ecda58f708..48b1383423c82bcd65f09d312a1d3851
READY_TO_COMMIT,
DID_COMMIT,
CANCELING,
@@ -5316,10 +5332,14 @@ void NavigationRequest::CheckStateTransition(NavigationState state) const {
@@ -5351,10 +5367,14 @@ void NavigationRequest::CheckStateTransition(NavigationState state) const {
WILL_FAIL_REQUEST,
}},
{WILL_PROCESS_RESPONSE, {
@ -91,10 +91,10 @@ index 6c29eb162f68f505ed3bb2e85c4f60ecda58f708..48b1383423c82bcd65f09d312a1d3851
NOT_STARTED,
DID_COMMIT,
diff --git a/content/browser/renderer_host/navigation_request.h b/content/browser/renderer_host/navigation_request.h
index 6f293b4c88decb7306910707bfc59e7609966802..2109a1f42472e2e70b38bae1b58c4d130fb250cb 100644
index 75a0258e27546237e1382083c0cc5fb2016e638c..a0b16ea67cd74f74058570a1ede64b305578bb09 100644
--- a/content/browser/renderer_host/navigation_request.h
+++ b/content/browser/renderer_host/navigation_request.h
@@ -131,6 +131,10 @@ class CONTENT_EXPORT NavigationRequest
@@ -133,6 +133,10 @@ class CONTENT_EXPORT NavigationRequest
// asynchronous.
WILL_PROCESS_RESPONSE,
@ -106,10 +106,10 @@ index 6f293b4c88decb7306910707bfc59e7609966802..2109a1f42472e2e70b38bae1b58c4d13
READY_TO_COMMIT,
diff --git a/content/browser/renderer_host/render_frame_host_manager.cc b/content/browser/renderer_host/render_frame_host_manager.cc
index 910338af8eb6b9e3551bbf4245007433ad1decac..1d5ab0a319b1c43d43a9c1e1e76de245cd5d6a4e 100644
index 8c5937f1d4caab2d2554269be0bfee10925ddf7e..f276a55a8e097a63f02e7a038667ec381d331224 100644
--- a/content/browser/renderer_host/render_frame_host_manager.cc
+++ b/content/browser/renderer_host/render_frame_host_manager.cc
@@ -2679,6 +2679,16 @@ scoped_refptr<SiteInstance>
@@ -2703,6 +2703,16 @@ scoped_refptr<SiteInstance>
RenderFrameHostManager::GetSiteInstanceForNavigationRequest(
NavigationRequest* request,
std::string* reason) {
@ -126,7 +126,7 @@ index 910338af8eb6b9e3551bbf4245007433ad1decac..1d5ab0a319b1c43d43a9c1e1e76de245
SiteInstance* current_site_instance = render_frame_host_->GetSiteInstance();
// All children of MHTML documents must be MHTML documents. They all live in
@@ -2706,10 +2716,60 @@ RenderFrameHostManager::GetSiteInstanceForNavigationRequest(
@@ -2730,10 +2740,60 @@ RenderFrameHostManager::GetSiteInstanceForNavigationRequest(
//
// TODO(clamy): We should also consider as a candidate SiteInstance the
// speculative SiteInstance that was computed on redirects.
@ -191,7 +191,7 @@ index 910338af8eb6b9e3551bbf4245007433ad1decac..1d5ab0a319b1c43d43a9c1e1e76de245
// Account for renderer-initiated reload as well.
// Needed as a workaround for https://crbug.com/1045524, remove it when it is
@@ -2749,6 +2809,9 @@ RenderFrameHostManager::GetSiteInstanceForNavigationRequest(
@@ -2773,6 +2833,9 @@ RenderFrameHostManager::GetSiteInstanceForNavigationRequest(
request->ResetStateForSiteInstanceChange();
}
@ -229,7 +229,7 @@ index 3dc0f0cf7f3e9b9e75cf053817e9ac5fba0182bc..16759a044e24ac3c0719a57e196fbf3e
size_t GetRelatedActiveContentsCount() override;
bool RequiresDedicatedProcess() override;
diff --git a/content/public/browser/content_browser_client.cc b/content/public/browser/content_browser_client.cc
index 91f04ded7cb3d539ec34c1f542023aea1738654e..729a1560facbf3cfe080c0188255f3d3ebeeb844 100644
index e9e45bacdcc5ad09ac933ccaaa663e0d05a0ad33..780e3a085843a34e226838e24a3df0b62379e688 100644
--- a/content/public/browser/content_browser_client.cc
+++ b/content/public/browser/content_browser_client.cc
@@ -65,6 +65,21 @@
@ -255,10 +255,10 @@ index 91f04ded7cb3d539ec34c1f542023aea1738654e..729a1560facbf3cfe080c0188255f3d3
const MainFunctionParams& parameters) {
return nullptr;
diff --git a/content/public/browser/content_browser_client.h b/content/public/browser/content_browser_client.h
index 4337c4121573a8e010a3697c492d92f66a09ad13..604dceb7cf068f6bb68fbd4e1d95182669aa9426 100644
index 133aef45c3187fac0e47e1538df3252de1fdfb8c..7c14448a06f64a685797c604564118c4a3c45f24 100644
--- a/content/public/browser/content_browser_client.h
+++ b/content/public/browser/content_browser_client.h
@@ -254,8 +254,45 @@ class CONTENT_EXPORT ContentBrowserClient {
@@ -255,8 +255,45 @@ class CONTENT_EXPORT ContentBrowserClient {
using IsClipboardPasteAllowedCallback =
base::OnceCallback<void(ClipboardPasteAllowed)>;