summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@qt.io>2021-04-27 15:52:43 +0200
committerAllan Sandfeld Jensen <allan.jensen@qt.io>2021-04-28 14:39:56 +0000
commit6c7b4ffb3fe19e7c6a2db60ce2d05c3b50c16ffc (patch)
tree49bd421025917750f1b86e9ed1f8530ac905e2c0
parenta12ed350a0e812aa68dc36209a4621dfb453219d (diff)
FIXUP: Avoid crashing on new window in cross-origin isolated content
Wasn't adapted to 87-based. Change-Id: I2e07bbcf902be226b76e01c44964293574569f16 Reviewed-by: Michael BrĂ¼ning <michael.bruning@qt.io>
-rw-r--r--chromium/content/browser/renderer_host/render_frame_host_manager.cc5
1 files changed, 2 insertions, 3 deletions
diff --git a/chromium/content/browser/renderer_host/render_frame_host_manager.cc b/chromium/content/browser/renderer_host/render_frame_host_manager.cc
index 9f44ee06882..f565e8319dc 100644
--- a/chromium/content/browser/renderer_host/render_frame_host_manager.cc
+++ b/chromium/content/browser/renderer_host/render_frame_host_manager.cc
@@ -164,9 +164,8 @@ bool IsSiteInstanceCompatibleWithCoopCoepCrossOriginIsolation(
// We do not want cross-origin-isolated have any impact on SiteInstances until
// we get an actual COOP value in a redirect or a final response.
if (is_speculative)
- return !site_instance_impl->IsCoopCoepCrossOriginIsolated() ||
- site_instance_impl->GetCoopCoepCrossOriginIsolatedInfo() ==
- cross_origin_isolated_info;
+ return site_instance_impl->IsCoopCoepCrossOriginIsolated() ==
+ is_coop_coep_cross_origin_isolated;
// Note: The about blank case is to accommodate web tests that use COOP. They
// expect an about:blank page to stay in process, and hang otherwise. In