chore_partial_revert_of.patch 1.5 KB

12345678910111213141516171819202122232425262728
  1. From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
  2. From: Charles Kerr <[email protected]>
  3. Date: Sat, 28 Sep 2024 17:33:51 -0500
  4. Subject: chore: partial revert of
  5. https://chromium-review.googlesource.com/c/chromium/src/+/5894233
  6. The `CHECK_EQ()` being removed here is failing in the Chromium roll.
  7. I experimented with backporting the `CHECK_EQ()` to `main` and it's
  8. failing there as well, so some pre-existing behavior in Electron is
  9. incompatible with this assertion.
  10. I will file an upgrades-followup-task issue in Electron and try to
  11. track down the source of this problem & figure out if we can fix it
  12. by changing something in Electron.
  13. diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
  14. index 8c805aec2042d7c02ba0a28f544feb6d976a0775..d5e8086df8b15f90acbea43f93706c2b9543a8ef 100644
  15. --- a/content/browser/web_contents/web_contents_impl.cc
  16. +++ b/content/browser/web_contents/web_contents_impl.cc
  17. @@ -4950,7 +4950,7 @@ FrameTree* WebContentsImpl::CreateNewWindow(
  18. : IsGuest();
  19. // While some guest types do not have a guest SiteInstance, the ones that
  20. // don't all override WebContents creation above.
  21. - CHECK_EQ(source_site_instance->IsGuest(), is_guest);
  22. + // CHECK_EQ(source_site_instance->IsGuest(), is_guest);
  23. // We usually create the new window in the same BrowsingInstance (group of
  24. // script-related windows), by passing in the current SiteInstance. However,