From 4ff4593bfceac1368eecd8231b6b6a0e279b221d Mon Sep 17 00:00:00 2001 From: Marshall Greenblatt Date: Mon, 5 May 2025 12:10:53 -0400 Subject: [PATCH] Update to Chromium version 136.0.7103.49 --- CHROMIUM_BUILD_COMPATIBILITY.txt | 2 +- patch/patch.cfg | 5 ----- patch/patches/chrome_browser.patch | 6 ++--- patch/patches/chrome_runtime.patch | 6 ++--- patch/patches/chrome_runtime_views.patch | 10 ++++----- .../net_schemeful_site_408329644.patch | 18 --------------- patch/patches/rfh_navigation_4829483.patch | 6 ++--- patch/patches/web_contents_1257_1565.patch | 22 +++++++++---------- 8 files changed, 26 insertions(+), 49 deletions(-) delete mode 100644 patch/patches/net_schemeful_site_408329644.patch diff --git a/CHROMIUM_BUILD_COMPATIBILITY.txt b/CHROMIUM_BUILD_COMPATIBILITY.txt index baf17611e..b1f9c79d3 100644 --- a/CHROMIUM_BUILD_COMPATIBILITY.txt +++ b/CHROMIUM_BUILD_COMPATIBILITY.txt @@ -7,5 +7,5 @@ # https://bitbucket.org/chromiumembedded/cef/wiki/BranchesAndBuilding { - 'chromium_checkout': 'refs/tags/136.0.7103.33' + 'chromium_checkout': 'refs/tags/136.0.7103.49' } diff --git a/patch/patch.cfg b/patch/patch.cfg index e4fce4d96..094c2ccf3 100644 --- a/patch/patch.cfg +++ b/patch/patch.cfg @@ -781,10 +781,5 @@ patches = [ # builds. # https://github.com/chromiumembedded/cef/issues/3892 'name': 'config_3892' - }, - { - # Fix DCHECK_EQ in SchemefulSite with custom standard schemes. - # https://issues.chromium.org/issues/408329644 - 'name': 'net_schemeful_site_408329644' } ] diff --git a/patch/patches/chrome_browser.patch b/patch/patches/chrome_browser.patch index 323b9893c..f0ac5f746 100644 --- a/patch/patches/chrome_browser.patch +++ b/patch/patches/chrome_browser.patch @@ -1,5 +1,5 @@ diff --git chrome/browser/BUILD.gn chrome/browser/BUILD.gn -index a3623400c3548..f7fe8e6c6fc66 100644 +index b5783087429ee..32b59c28e40bd 100644 --- chrome/browser/BUILD.gn +++ chrome/browser/BUILD.gn @@ -11,6 +11,7 @@ import("//build/config/compiler/pgo/pgo.gni") @@ -10,7 +10,7 @@ index a3623400c3548..f7fe8e6c6fc66 100644 import("//chrome/browser/buildflags.gni") import("//chrome/browser/downgrade/buildflags.gni") import("//chrome/browser/request_header_integrity/buildflags.gni") -@@ -1878,6 +1879,7 @@ static_library("browser") { +@@ -1884,6 +1885,7 @@ static_library("browser") { "//build/config/compiler:compiler_buildflags", "//build/config/linux/dbus:buildflags", "//cc", @@ -18,7 +18,7 @@ index a3623400c3548..f7fe8e6c6fc66 100644 "//chrome:extra_resources", "//chrome:resources", "//chrome:strings", -@@ -2577,6 +2579,10 @@ static_library("browser") { +@@ -2583,6 +2585,10 @@ static_library("browser") { sources += [ "net/net_error_diagnostics_dialog_stub.cc" ] } diff --git a/patch/patches/chrome_runtime.patch b/patch/patches/chrome_runtime.patch index 35b2eeb11..97ed2eac9 100644 --- a/patch/patches/chrome_runtime.patch +++ b/patch/patches/chrome_runtime.patch @@ -560,7 +560,7 @@ index 0751efb504919..7a45c45e92c44 100644 #endif diff --git chrome/browser/prefs/browser_prefs.cc chrome/browser/prefs/browser_prefs.cc -index 7393b3400afe4..e19f464f67640 100644 +index 77be6bf7413f9..95e8b3e788f4a 100644 --- chrome/browser/prefs/browser_prefs.cc +++ chrome/browser/prefs/browser_prefs.cc @@ -15,6 +15,7 @@ @@ -582,7 +582,7 @@ index 7393b3400afe4..e19f464f67640 100644 #if BUILDFLAG(ENABLE_EXTENSIONS) #include "chrome/browser/accessibility/animation_policy_prefs.h" #include "chrome/browser/apps/platform_apps/shortcut_manager.h" -@@ -1830,6 +1835,11 @@ void RegisterLocalState(PrefRegistrySimple* registry) { +@@ -1841,6 +1846,11 @@ void RegisterLocalState(PrefRegistrySimple* registry) { // This is intentionally last. RegisterLocalStatePrefsForMigration(registry); @@ -594,7 +594,7 @@ index 7393b3400afe4..e19f464f67640 100644 } // Register prefs applicable to all profiles. -@@ -2271,6 +2281,10 @@ void RegisterUserProfilePrefs(user_prefs::PrefRegistrySyncable* registry, +@@ -2282,6 +2292,10 @@ void RegisterUserProfilePrefs(user_prefs::PrefRegistrySyncable* registry, const std::string& locale) { RegisterProfilePrefs(registry, locale); diff --git a/patch/patches/chrome_runtime_views.patch b/patch/patches/chrome_runtime_views.patch index f0cb8d0dc..9eac87913 100644 --- a/patch/patches/chrome_runtime_views.patch +++ b/patch/patches/chrome_runtime_views.patch @@ -41,7 +41,7 @@ index 3fcd374a0223f..37a4d0a0b2fe4 100644 void BrowserCommandController::InitCommandState() { diff --git chrome/browser/ui/toolbar/app_menu_model.cc chrome/browser/ui/toolbar/app_menu_model.cc -index 3dc212eb62ae8..4191ffa5f52a8 100644 +index 4afe64b8b2f33..d1997e0ff5485 100644 --- chrome/browser/ui/toolbar/app_menu_model.cc +++ chrome/browser/ui/toolbar/app_menu_model.cc @@ -736,10 +736,12 @@ FindAndEditSubMenuModel::FindAndEditSubMenuModel( @@ -115,7 +115,7 @@ index 3dc212eb62ae8..4191ffa5f52a8 100644 } // namespace //////////////////////////////////////////////////////////////////////////////// -@@ -1748,7 +1801,7 @@ bool AppMenuModel::IsCommandIdChecked(int command_id) const { +@@ -1747,7 +1800,7 @@ bool AppMenuModel::IsCommandIdChecked(int command_id) const { return false; } @@ -124,7 +124,7 @@ index 3dc212eb62ae8..4191ffa5f52a8 100644 GlobalError* error = GlobalErrorServiceFactory::GetForProfile(browser_->profile()) ->GetGlobalErrorByMenuItemCommandID(command_id); -@@ -1764,6 +1817,30 @@ bool AppMenuModel::IsCommandIdEnabled(int command_id) const { +@@ -1763,6 +1816,30 @@ bool AppMenuModel::IsCommandIdEnabled(int command_id) const { } } @@ -155,7 +155,7 @@ index 3dc212eb62ae8..4191ffa5f52a8 100644 bool AppMenuModel::IsCommandIdAlerted(int command_id) const { if (command_id == IDC_VIEW_PASSWORDS || command_id == IDC_SHOW_PASSWORD_MANAGER) { -@@ -1919,8 +1996,10 @@ void AppMenuModel::Build() { +@@ -1918,8 +1995,10 @@ void AppMenuModel::Build() { IDS_CLEAR_BROWSING_DATA, kTrashCanRefreshIcon); @@ -166,7 +166,7 @@ index 3dc212eb62ae8..4191ffa5f52a8 100644 AddSeparator(ui::NORMAL_SEPARATOR); AddItemWithStringIdAndVectorIcon(this, IDC_PRINT, IDS_PRINT, kPrintMenuIcon); -@@ -2028,6 +2107,11 @@ void AppMenuModel::Build() { +@@ -2027,6 +2106,11 @@ void AppMenuModel::Build() { } #endif // !BUILDFLAG(IS_CHROMEOS) diff --git a/patch/patches/net_schemeful_site_408329644.patch b/patch/patches/net_schemeful_site_408329644.patch deleted file mode 100644 index 2d68afd26..000000000 --- a/patch/patches/net_schemeful_site_408329644.patch +++ /dev/null @@ -1,18 +0,0 @@ -diff --git net/base/schemeful_site.cc net/base/schemeful_site.cc -index 4b9760d916213..87556e7e0dc99 100644 ---- net/base/schemeful_site.cc -+++ net/base/schemeful_site.cc -@@ -43,6 +43,13 @@ bool IsSameSiteInternal(const url::Origin& a, - return true; - } - -+ // If host equality is false, then the only way the origins can be same site -+ // is if we have a standard scheme with a network host, which is the only case -+ // when SchemefulSite looks at the registerable domain. -+ if (!IsStandardSchemeWithNetworkHost(a.scheme())) { -+ return false; -+ } -+ - std::string_view b_site = GetDomainAndRegistryAsStringPiece( - b, net::registry_controlled_domains::INCLUDE_PRIVATE_REGISTRIES); - diff --git a/patch/patches/rfh_navigation_4829483.patch b/patch/patches/rfh_navigation_4829483.patch index 4eafe6192..f2186bacc 100644 --- a/patch/patches/rfh_navigation_4829483.patch +++ b/patch/patches/rfh_navigation_4829483.patch @@ -1,8 +1,8 @@ diff --git content/browser/renderer_host/render_frame_host_impl.cc content/browser/renderer_host/render_frame_host_impl.cc -index d905ce52d71b2..167a1a40fab3c 100644 +index d9be4e90a7c43..ef700fae8e43d 100644 --- content/browser/renderer_host/render_frame_host_impl.cc +++ content/browser/renderer_host/render_frame_host_impl.cc -@@ -9654,6 +9654,16 @@ void RenderFrameHostImpl::CreateNewWindow( +@@ -9662,6 +9662,16 @@ void RenderFrameHostImpl::CreateNewWindow( return; } @@ -19,7 +19,7 @@ index d905ce52d71b2..167a1a40fab3c 100644 // Otherwise, consume user activation before we proceed. In particular, it is // important to do this before we return from the |opener_suppressed| case // below. -@@ -12061,6 +12071,7 @@ void RenderFrameHostImpl::CommitNavigation( +@@ -12069,6 +12079,7 @@ void RenderFrameHostImpl::CommitNavigation( auto browser_calc_origin_to_commit = navigation_request->GetOriginToCommitWithDebugInfo(); if (!process_lock.is_error_page() && !is_mhtml_subframe && diff --git a/patch/patches/web_contents_1257_1565.patch b/patch/patches/web_contents_1257_1565.patch index 5a57ee32f..8a250010c 100644 --- a/patch/patches/web_contents_1257_1565.patch +++ b/patch/patches/web_contents_1257_1565.patch @@ -1,8 +1,8 @@ diff --git content/browser/web_contents/web_contents_impl.cc content/browser/web_contents/web_contents_impl.cc -index f80d8ecc385df..b879741c441af 100644 +index 2896b2b15d9c2..8e12c2134117c 100644 --- content/browser/web_contents/web_contents_impl.cc +++ content/browser/web_contents/web_contents_impl.cc -@@ -3916,6 +3916,12 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params, +@@ -3922,6 +3922,12 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params, params.main_frame_name, GetOpener(), primary_main_frame_policy, base::UnguessableToken::Create()); @@ -15,7 +15,7 @@ index f80d8ecc385df..b879741c441af 100644 std::unique_ptr delegate = GetContentClient()->browser()->GetWebContentsViewDelegate(this); -@@ -3926,6 +3932,7 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params, +@@ -3932,6 +3938,7 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params, view_ = CreateWebContentsView(this, std::move(delegate), &render_view_host_delegate_view_); } @@ -23,7 +23,7 @@ index f80d8ecc385df..b879741c441af 100644 CHECK(render_view_host_delegate_view_); CHECK(view_.get()); -@@ -4136,6 +4143,9 @@ void WebContentsImpl::RenderWidgetCreated( +@@ -4142,6 +4149,9 @@ void WebContentsImpl::RenderWidgetCreated( "render_widget_host", render_widget_host); CHECK(!created_widgets_.contains(render_widget_host->GetFrameSinkId())); created_widgets_[render_widget_host->GetFrameSinkId()] = render_widget_host; @@ -33,7 +33,7 @@ index f80d8ecc385df..b879741c441af 100644 } void WebContentsImpl::RenderWidgetDeleted( -@@ -5055,6 +5065,15 @@ FrameTree* WebContentsImpl::CreateNewWindow( +@@ -5061,6 +5071,15 @@ FrameTree* WebContentsImpl::CreateNewWindow( create_params.picture_in_picture_options = *(params.pip_options); } @@ -49,7 +49,7 @@ index f80d8ecc385df..b879741c441af 100644 // Check whether there is an available prerendered page for this navigation if // this is not for guest. If it exists, take WebContents pre-created for // hosting the prerendered page instead of creating new WebContents. -@@ -9764,6 +9783,9 @@ void WebContentsImpl::SetFocusedFrame(FrameTreeNode* node, +@@ -9777,6 +9796,9 @@ void WebContentsImpl::SetFocusedFrame(FrameTreeNode* node, } CloseListenerManager::DidChangeFocusedFrame(this); @@ -59,7 +59,7 @@ index f80d8ecc385df..b879741c441af 100644 } FrameTree* WebContentsImpl::GetOwnedPictureInPictureFrameTree() { -@@ -10411,6 +10433,11 @@ void WebContentsImpl::Resize(const gfx::Rect& new_bounds) { +@@ -10424,6 +10446,11 @@ void WebContentsImpl::Resize(const gfx::Rect& new_bounds) { OPTIONAL_TRACE_EVENT0("content", "WebContentsImpl::Resize"); #if defined(USE_AURA) aura::Window* window = GetNativeView(); @@ -71,7 +71,7 @@ index f80d8ecc385df..b879741c441af 100644 window->SetBounds(gfx::Rect(window->bounds().origin(), new_bounds.size())); #elif BUILDFLAG(IS_ANDROID) content::RenderWidgetHostView* view = GetRenderWidgetHostView(); -@@ -10423,6 +10450,11 @@ void WebContentsImpl::Resize(const gfx::Rect& new_bounds) { +@@ -10436,6 +10463,11 @@ void WebContentsImpl::Resize(const gfx::Rect& new_bounds) { gfx::Size WebContentsImpl::GetSize() { #if defined(USE_AURA) aura::Window* window = GetNativeView(); @@ -179,10 +179,10 @@ index da319cb207331..bcd4de085fa6b 100644 // typically happens when popups are created. virtual void WebContentsCreated(WebContents* source_contents, diff --git content/public/browser/web_contents_observer.h content/public/browser/web_contents_observer.h -index 9f9f4cc755886..305095e5ef2f2 100644 +index e06a02965a79f..0f587338a513e 100644 --- content/public/browser/web_contents_observer.h +++ content/public/browser/web_contents_observer.h -@@ -255,6 +255,9 @@ class CONTENT_EXPORT WebContentsObserver : public base::CheckedObserver { +@@ -259,6 +259,9 @@ class CONTENT_EXPORT WebContentsObserver : public base::CheckedObserver { // to forwardGestures(), whichever the case ends up being. virtual void OnCapturedSurfaceControl() {} @@ -192,7 +192,7 @@ index 9f9f4cc755886..305095e5ef2f2 100644 // This method is invoked when the `blink::WebView` of the current // RenderViewHost is ready, e.g. because we recreated it after a crash. virtual void RenderViewReady() {} -@@ -949,6 +952,10 @@ class CONTENT_EXPORT WebContentsObserver : public base::CheckedObserver { +@@ -953,6 +956,10 @@ class CONTENT_EXPORT WebContentsObserver : public base::CheckedObserver { // WebContents has gained/lost focus. virtual void OnFocusChangedInPage(FocusedNodeDetails* details) {}