chore: bump chromium to 31b4a223e6e2bd9d5ce6c37cbdec6 (master) (#22514)

* chore: bump chromium in DEPS to 7f366dc6e2f06228b12b021cc1486a1de81a257d

* chore: bump chromium in DEPS to d785c1a601f5f33627d23e40b1ed9dd94c63d818

* update patches

* Rename an old referrer policy value

2082856

* chore: bump chromium in DEPS to 735e0d2910b2e55c15e0b9cb9fca9431307ac661

* update v8 patches

* Update DEPS

* update patches

* chore: bump chromium in DEPS to b3d09c15c4460680b85218b7b0eb0849c5a6e840

* Replace blink::WebCursorInfo with ui::Cursor

1997138

* chore: bump chromium in DEPS to bf433ad6dcfcaac460512bb45a53d5a2ea5356f9

* chore: bump chromium in DEPS to 38fad190ac908b6977ab271acc82c2fe74f6e85e

* chore: bump chromium in DEPS to aa597178119cb37ab54caeda27b2ef30a2f9a003

* update patches

* DownloadURLParameters: Remove NetworkIsolationKey parameter.

2050987

* fix pdf viewer tests by binding more mojo things

* chore: bump chromium in DEPS to 08835601be331b4a223e6e2bd9d5ce6c37cbdec6

Co-authored-by: Jeremy Apthorp <jeremya@chromium.org>
Co-authored-by: Jeremy Apthorp <nornagon@nornagon.net>
This commit is contained in:
Electron Bot 2020-03-11 04:15:07 -07:00 committed by GitHub
parent 7150fa783e
commit 62da00e5c5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
48 changed files with 266 additions and 228 deletions

View file

@ -42,10 +42,10 @@ index 906a1ee4ac58b0744a32153bbaafeac4322a60e4..c90f4aead36cbf3767dc5094728963c2
// another SiteInstance for the same site.
void RegisterSiteInstance(SiteInstanceImpl* site_instance);
diff --git a/content/browser/frame_host/navigation_request.cc b/content/browser/frame_host/navigation_request.cc
index 113700fbfbbb61b27c6f7bdee7f143e59807e411..f57678422f261b08f682c8290bcf4a47dc4dafd3 100644
index bd35bd8a8deaa3d93939f78d9dd11be152840783..c9aa08e363b2fd61f7b27245478964fb81fb2c65 100644
--- a/content/browser/frame_host/navigation_request.cc
+++ b/content/browser/frame_host/navigation_request.cc
@@ -1253,6 +1253,24 @@ void NavigationRequest::BeginNavigation() {
@@ -1257,6 +1257,24 @@ void NavigationRequest::BeginNavigation() {
// it immediately.
EnterChildTraceEvent("ResponseStarted", this);
@ -71,10 +71,10 @@ index 113700fbfbbb61b27c6f7bdee7f143e59807e411..f57678422f261b08f682c8290bcf4a47
render_frame_host_ =
frame_tree_node_->render_manager()->GetFrameHostForNavigation(this);
diff --git a/content/browser/frame_host/render_frame_host_manager.cc b/content/browser/frame_host/render_frame_host_manager.cc
index 07eebdd7863d9cb0f03f203c8d85275aa1374faa..d615a90014330b32e5ddd1b2dd22cf2421bdf3e7 100644
index 6ab309abdd92f4b8e2bb4f789bbb225997f81cc7..ad6d9770bf3398d6086b9a90dfad19207b2fb6e1 100644
--- a/content/browser/frame_host/render_frame_host_manager.cc
+++ b/content/browser/frame_host/render_frame_host_manager.cc
@@ -2327,6 +2327,16 @@ bool RenderFrameHostManager::InitRenderView(
@@ -2329,6 +2329,16 @@ bool RenderFrameHostManager::InitRenderView(
scoped_refptr<SiteInstance>
RenderFrameHostManager::GetSiteInstanceForNavigationRequest(
NavigationRequest* request) {
@ -91,7 +91,7 @@ index 07eebdd7863d9cb0f03f203c8d85275aa1374faa..d615a90014330b32e5ddd1b2dd22cf24
SiteInstance* current_site_instance = render_frame_host_->GetSiteInstance();
// All children of MHTML documents must be MHTML documents. They all live in
@@ -2346,10 +2356,60 @@ RenderFrameHostManager::GetSiteInstanceForNavigationRequest(
@@ -2348,10 +2358,60 @@ RenderFrameHostManager::GetSiteInstanceForNavigationRequest(
//
// TODO(clamy): We should also consider as a candidate SiteInstance the
// speculative SiteInstance that was computed on redirects.
@ -156,7 +156,7 @@ index 07eebdd7863d9cb0f03f203c8d85275aa1374faa..d615a90014330b32e5ddd1b2dd22cf24
// Account for renderer-initiated reload as well.
// Needed as a workaround for https://crbug.com/1045524, remove it when it is
@@ -2388,6 +2448,9 @@ RenderFrameHostManager::GetSiteInstanceForNavigationRequest(
@@ -2393,6 +2453,9 @@ RenderFrameHostManager::GetSiteInstanceForNavigationRequest(
request->ResetStateForSiteInstanceChange();
}
@ -194,7 +194,7 @@ index caa100b3889e17a9afdc8127e0e13bb6b86e8042..f08d3a2eb28f0f6fff89b5759eff5369
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 2ea6dbb5697268743026d24116bc5c509f950b4b..06b52f68eef476dd7c38003e20ebc868162ff996 100644
index 4ebd47182f8e237b49ad202b5ab3d9d39beb52bf..ad4eba3b5a0de32e48c3ae5b19de858c27ba5dfd 100644
--- a/content/public/browser/content_browser_client.cc
+++ b/content/public/browser/content_browser_client.cc
@@ -58,6 +58,21 @@
@ -220,7 +220,7 @@ index 2ea6dbb5697268743026d24116bc5c509f950b4b..06b52f68eef476dd7c38003e20ebc868
const MainFunctionParams& parameters) {
return nullptr;
diff --git a/content/public/browser/content_browser_client.h b/content/public/browser/content_browser_client.h
index ee1034ee1bcd3f47964fec8fe11573596754e3b8..9351616f0100694f18c760417a7d93a001d3bb72 100644
index 050ece82da9dbcd7ad1a41deb3f9f731e9ed7b49..e4f531edd533525a84b59fac0521b0ee9954e853 100644
--- a/content/public/browser/content_browser_client.h
+++ b/content/public/browser/content_browser_client.h
@@ -231,8 +231,45 @@ class CONTENT_EXPORT ContentBrowserClient {