chore: bump chromium to 7d4ac110045b7647fa8a81f5f0709 (master) (#24970)
* chore: bump chromium in DEPS to 760c905ccca34d8ed83c54f6a42c42a375792a6b * chore: update patches - Introduce WebContentsObserverList to encapsulate common behaviour2343269
- DumpAccTree mac testing: refactor tree formatter logic to make it suitable for nested attribute calls2274545
- Fix FontPlatformDataMacTest.VariableOpticalSizingThreshold for Big Sur2351299
* chore: bump chromium in DEPS to b04584161e07d4ac110045b7647fa8a81f5f0709 * chore: update patches * [printing] Move printing::MarginType to //printing/mojom/print.mojom2341222
Co-authored-by: deepak1556 <hop2deep@gmail.com>
This commit is contained in:
parent
4ef827c13c
commit
53033a66b1
37 changed files with 233 additions and 246 deletions
|
@ -42,10 +42,10 @@ index 7f588450c441ed2b17db06afb38075bbfadfc633..e56178401374f3c6a9536056511fb63a
|
|||
// 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 9830bd1d352e93c97f55390b3f103dc297091d3e..8cc8665cf95664708ea5cc1a38bf01717275dc1f 100644
|
||||
index a6d3bafd08336a07012e46aba6d611c62e61c7cf..f7b03517380b653071384a9686924b584efadde7 100644
|
||||
--- a/content/browser/frame_host/navigation_request.cc
|
||||
+++ b/content/browser/frame_host/navigation_request.cc
|
||||
@@ -1463,6 +1463,21 @@ void NavigationRequest::BeginNavigation() {
|
||||
@@ -1475,6 +1475,21 @@ void NavigationRequest::BeginNavigation() {
|
||||
// it immediately.
|
||||
EnterChildTraceEvent("ResponseStarted", this);
|
||||
|
||||
|
@ -67,7 +67,7 @@ index 9830bd1d352e93c97f55390b3f103dc297091d3e..8cc8665cf95664708ea5cc1a38bf0171
|
|||
// Select an appropriate RenderFrameHost.
|
||||
render_frame_host_ =
|
||||
frame_tree_node_->render_manager()->GetFrameHostForNavigation(this);
|
||||
@@ -4967,6 +4982,7 @@ void NavigationRequest::CheckStateTransition(NavigationState state) const {
|
||||
@@ -5043,6 +5058,7 @@ void NavigationRequest::CheckStateTransition(NavigationState state) const {
|
||||
{WILL_START_REQUEST, {
|
||||
WILL_REDIRECT_REQUEST,
|
||||
WILL_PROCESS_RESPONSE,
|
||||
|
@ -75,7 +75,7 @@ index 9830bd1d352e93c97f55390b3f103dc297091d3e..8cc8665cf95664708ea5cc1a38bf0171
|
|||
READY_TO_COMMIT,
|
||||
DID_COMMIT,
|
||||
CANCELING,
|
||||
@@ -4980,10 +4996,14 @@ void NavigationRequest::CheckStateTransition(NavigationState state) const {
|
||||
@@ -5056,10 +5072,14 @@ void NavigationRequest::CheckStateTransition(NavigationState state) const {
|
||||
WILL_FAIL_REQUEST,
|
||||
}},
|
||||
{WILL_PROCESS_RESPONSE, {
|
||||
|
@ -91,10 +91,10 @@ index 9830bd1d352e93c97f55390b3f103dc297091d3e..8cc8665cf95664708ea5cc1a38bf0171
|
|||
NOT_STARTED,
|
||||
DID_COMMIT,
|
||||
diff --git a/content/browser/frame_host/navigation_request.h b/content/browser/frame_host/navigation_request.h
|
||||
index bc60e642831d6407b8c31fd923ff49baf42f45e6..37e3824e346e7b299f1be28158e9a313cb19fef9 100644
|
||||
index cfcc6cd6cbc2723156a2bce1cd8a98a979952a04..a6736ae58641501041a676505ea8a3680f90cdf7 100644
|
||||
--- a/content/browser/frame_host/navigation_request.h
|
||||
+++ b/content/browser/frame_host/navigation_request.h
|
||||
@@ -155,6 +155,10 @@ class CONTENT_EXPORT NavigationRequest
|
||||
@@ -162,6 +162,10 @@ class CONTENT_EXPORT NavigationRequest
|
||||
// asynchronous.
|
||||
WILL_PROCESS_RESPONSE,
|
||||
|
||||
|
@ -106,10 +106,10 @@ index bc60e642831d6407b8c31fd923ff49baf42f45e6..37e3824e346e7b299f1be28158e9a313
|
|||
READY_TO_COMMIT,
|
||||
|
||||
diff --git a/content/browser/frame_host/render_frame_host_manager.cc b/content/browser/frame_host/render_frame_host_manager.cc
|
||||
index dd3c9f1d08b8e8f931aebf0726b721666b85ce84..c353271eb33ae7d0ce9021aa052a97c4b341d970 100644
|
||||
index 3223378b661e6a53e62d7981c90beb67a51dc900..f83175d673e280e81ae3175d98172763f9c016ae 100644
|
||||
--- a/content/browser/frame_host/render_frame_host_manager.cc
|
||||
+++ b/content/browser/frame_host/render_frame_host_manager.cc
|
||||
@@ -2375,6 +2375,16 @@ bool RenderFrameHostManager::InitRenderView(
|
||||
@@ -2383,6 +2383,16 @@ bool RenderFrameHostManager::InitRenderView(
|
||||
scoped_refptr<SiteInstance>
|
||||
RenderFrameHostManager::GetSiteInstanceForNavigationRequest(
|
||||
NavigationRequest* request) {
|
||||
|
@ -126,7 +126,7 @@ index dd3c9f1d08b8e8f931aebf0726b721666b85ce84..c353271eb33ae7d0ce9021aa052a97c4
|
|||
SiteInstance* current_site_instance = render_frame_host_->GetSiteInstance();
|
||||
|
||||
// All children of MHTML documents must be MHTML documents. They all live in
|
||||
@@ -2394,10 +2404,60 @@ RenderFrameHostManager::GetSiteInstanceForNavigationRequest(
|
||||
@@ -2402,10 +2412,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 dd3c9f1d08b8e8f931aebf0726b721666b85ce84..c353271eb33ae7d0ce9021aa052a97c4
|
|||
|
||||
// Account for renderer-initiated reload as well.
|
||||
// Needed as a workaround for https://crbug.com/1045524, remove it when it is
|
||||
@@ -2423,6 +2483,9 @@ RenderFrameHostManager::GetSiteInstanceForNavigationRequest(
|
||||
@@ -2431,6 +2491,9 @@ RenderFrameHostManager::GetSiteInstanceForNavigationRequest(
|
||||
request->ResetStateForSiteInstanceChange();
|
||||
}
|
||||
|
||||
|
@ -202,10 +202,10 @@ index dd3c9f1d08b8e8f931aebf0726b721666b85ce84..c353271eb33ae7d0ce9021aa052a97c4
|
|||
}
|
||||
|
||||
diff --git a/content/browser/site_instance_impl.cc b/content/browser/site_instance_impl.cc
|
||||
index c2aa245738446790cc61192c3ca2e5ea459df849..2fe2b639601235b1820f6f03fabcb7ba95f76a78 100644
|
||||
index b167aaf428df5feeac16c68beec3e947d44cd61f..c2ad9320b242c228b295a7fe20cc258282d95a09 100644
|
||||
--- a/content/browser/site_instance_impl.cc
|
||||
+++ b/content/browser/site_instance_impl.cc
|
||||
@@ -501,6 +501,10 @@ bool SiteInstanceImpl::HasRelatedSiteInstance(const SiteInfo& site_info) {
|
||||
@@ -505,6 +505,10 @@ bool SiteInstanceImpl::HasRelatedSiteInstance(const SiteInfo& site_info) {
|
||||
return browsing_instance_->HasSiteInstance(site_info);
|
||||
}
|
||||
|
||||
|
@ -217,7 +217,7 @@ index c2aa245738446790cc61192c3ca2e5ea459df849..2fe2b639601235b1820f6f03fabcb7ba
|
|||
const GURL& url) {
|
||||
return browsing_instance_->GetSiteInstanceForURL(
|
||||
diff --git a/content/browser/site_instance_impl.h b/content/browser/site_instance_impl.h
|
||||
index 0fecca6137cf970ce747491b218e8cacf242758c..806852dc83e8bcfac8c117a4d8961b56b0c055d2 100644
|
||||
index 9fffa8c2c602aa373400dfb0d1c817f34b75bc8f..f898ab9291f66ac0cfbf0317f47befc8d832b364 100644
|
||||
--- a/content/browser/site_instance_impl.h
|
||||
+++ b/content/browser/site_instance_impl.h
|
||||
@@ -184,6 +184,7 @@ class CONTENT_EXPORT SiteInstanceImpl final : public SiteInstance,
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue