From c741db0d1f3992702fb2a459c40af36cb5050dfe Mon Sep 17 00:00:00 2001 From: Marshall Greenblatt Date: Fri, 21 Jun 2024 15:11:46 +0000 Subject: [PATCH] Update to Chromium version 127.0.6533.17 --- CHROMIUM_BUILD_COMPATIBILITY.txt | 2 +- patch/patches/base_thread_pool_5548577.patch | 2 +- patch/patches/chrome_browser.patch | 6 +-- patch/patches/chrome_browser_browser.patch | 40 ++++++++++---------- patch/patches/chrome_browser_download.patch | 10 ++--- patch/patches/chrome_browser_profiles.patch | 4 +- patch/patches/chrome_runtime.patch | 2 +- patch/patches/chrome_runtime_views.patch | 14 +++---- patch/patches/views_1749_2102_3330.patch | 4 +- 9 files changed, 42 insertions(+), 42 deletions(-) diff --git a/CHROMIUM_BUILD_COMPATIBILITY.txt b/CHROMIUM_BUILD_COMPATIBILITY.txt index e9ef40509..4414d9610 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/127.0.6533.5' + 'chromium_checkout': 'refs/tags/127.0.6533.17' } diff --git a/patch/patches/base_thread_pool_5548577.patch b/patch/patches/base_thread_pool_5548577.patch index 444da328b..ce30b3328 100644 --- a/patch/patches/base_thread_pool_5548577.patch +++ b/patch/patches/base_thread_pool_5548577.patch @@ -1,5 +1,5 @@ diff --git base/task/thread_pool/thread_pool_impl.cc base/task/thread_pool/thread_pool_impl.cc -index 4ac5cea5f6c08..559593f1564c9 100644 +index 4ac5cea5f6c08..a9c1c152568f3 100644 --- base/task/thread_pool/thread_pool_impl.cc +++ base/task/thread_pool/thread_pool_impl.cc @@ -105,6 +105,10 @@ ThreadPoolImpl::ThreadPoolImpl(std::string_view histogram_label, diff --git a/patch/patches/chrome_browser.patch b/patch/patches/chrome_browser.patch index 0250ae6b3..2a050b59e 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 8e3fde5e841e1..8adc42aea0836 100644 +index 26c825186ad85..821c5722ecabf 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 8e3fde5e841e1..8adc42aea0836 100644 import("//chrome/browser/buildflags.gni") import("//chrome/browser/downgrade/buildflags.gni") import("//chrome/common/features.gni") -@@ -2049,6 +2050,7 @@ static_library("browser") { +@@ -2055,6 +2056,7 @@ static_library("browser") { "//build/config/chromebox_for_meetings:buildflags", "//build/config/compiler:compiler_buildflags", "//cc", @@ -18,7 +18,7 @@ index 8e3fde5e841e1..8adc42aea0836 100644 "//chrome:extra_resources", "//chrome:resources", "//chrome:strings", -@@ -2769,6 +2771,10 @@ static_library("browser") { +@@ -2775,6 +2777,10 @@ static_library("browser") { ] } diff --git a/patch/patches/chrome_browser_browser.patch b/patch/patches/chrome_browser_browser.patch index 805e07605..bf3487749 100644 --- a/patch/patches/chrome_browser_browser.patch +++ b/patch/patches/chrome_browser_browser.patch @@ -140,7 +140,7 @@ index 74460ac479210..8cf70c80a87ad 100644 ] } diff --git chrome/browser/ui/browser.cc chrome/browser/ui/browser.cc -index 557abfcd71d85..fb64e93157148 100644 +index 4683794bedaa9..de933a524299d 100644 --- chrome/browser/ui/browser.cc +++ chrome/browser/ui/browser.cc @@ -272,6 +272,25 @@ @@ -180,7 +180,7 @@ index 557abfcd71d85..fb64e93157148 100644 tab_strip_model_delegate_( std::make_unique(this)), tab_strip_model_(std::make_unique( -@@ -757,6 +780,12 @@ Browser::~Browser() { +@@ -761,6 +784,12 @@ Browser::~Browser() { // away so they don't try and call back to us. if (select_file_dialog_.get()) select_file_dialog_->ListenerDestroyed(); @@ -193,7 +193,7 @@ index 557abfcd71d85..fb64e93157148 100644 } /////////////////////////////////////////////////////////////////////////////// -@@ -1217,6 +1246,8 @@ void Browser::WindowFullscreenStateChanged() { +@@ -1221,6 +1250,8 @@ void Browser::WindowFullscreenStateChanged() { ->WindowFullscreenStateChanged(); command_controller_->FullscreenStateChanged(); UpdateBookmarkBarState(BOOKMARK_BAR_STATE_CHANGE_TOGGLE_FULLSCREEN); @@ -202,7 +202,7 @@ index 557abfcd71d85..fb64e93157148 100644 } void Browser::FullscreenTopUIStateChanged() { -@@ -1584,6 +1615,14 @@ content::KeyboardEventProcessingResult Browser::PreHandleKeyboardEvent( +@@ -1594,6 +1625,14 @@ content::KeyboardEventProcessingResult Browser::PreHandleKeyboardEvent( if (exclusive_access_manager_->HandleUserKeyEvent(event)) return content::KeyboardEventProcessingResult::HANDLED; @@ -217,7 +217,7 @@ index 557abfcd71d85..fb64e93157148 100644 return window()->PreHandleKeyboardEvent(event); } -@@ -1591,8 +1630,18 @@ bool Browser::HandleKeyboardEvent(content::WebContents* source, +@@ -1601,8 +1640,18 @@ bool Browser::HandleKeyboardEvent(content::WebContents* source, const NativeWebKeyboardEvent& event) { DevToolsWindow* devtools_window = DevToolsWindow::GetInstanceForInspectedWebContents(source); @@ -238,7 +238,7 @@ index 557abfcd71d85..fb64e93157148 100644 } bool Browser::TabsNeedBeforeUnloadFired() const { -@@ -1768,6 +1817,16 @@ WebContents* Browser::OpenURLFromTab( +@@ -1778,6 +1827,16 @@ WebContents* Browser::OpenURLFromTab( } #endif // BUILDFLAG(IS_CHROMEOS_ASH) @@ -255,7 +255,7 @@ index 557abfcd71d85..fb64e93157148 100644 NavigateParams nav_params(this, params.url, params.transition); nav_params.FillNavigateParamsFromOpenURLParams(params); nav_params.source_contents = source; -@@ -1930,6 +1989,8 @@ void Browser::LoadingStateChanged(WebContents* source, +@@ -1940,6 +1999,8 @@ void Browser::LoadingStateChanged(WebContents* source, bool should_show_loading_ui) { ScheduleUIUpdate(source, content::INVALIDATE_TYPE_LOAD); UpdateWindowForLoadingStateChanged(source, should_show_loading_ui); @@ -264,7 +264,7 @@ index 557abfcd71d85..fb64e93157148 100644 } void Browser::CloseContents(WebContents* source) { -@@ -1958,6 +2019,8 @@ void Browser::SetContentsBounds(WebContents* source, const gfx::Rect& bounds) { +@@ -1968,6 +2029,8 @@ void Browser::SetContentsBounds(WebContents* source, const gfx::Rect& bounds) { } void Browser::UpdateTargetURL(WebContents* source, const GURL& url) { @@ -273,7 +273,7 @@ index 557abfcd71d85..fb64e93157148 100644 if (!GetStatusBubble()) return; -@@ -1965,6 +2028,17 @@ void Browser::UpdateTargetURL(WebContents* source, const GURL& url) { +@@ -1975,6 +2038,17 @@ void Browser::UpdateTargetURL(WebContents* source, const GURL& url) { GetStatusBubble()->SetURL(url); } @@ -291,7 +291,7 @@ index 557abfcd71d85..fb64e93157148 100644 void Browser::ContentsMouseEvent(WebContents* source, const ui::Event& event) { const ui::EventType type = event.type(); const bool exited = type == ui::ET_MOUSE_EXITED; -@@ -1992,6 +2066,19 @@ bool Browser::TakeFocus(content::WebContents* source, bool reverse) { +@@ -2002,6 +2076,19 @@ bool Browser::TakeFocus(content::WebContents* source, bool reverse) { return false; } @@ -311,7 +311,7 @@ index 557abfcd71d85..fb64e93157148 100644 void Browser::BeforeUnloadFired(WebContents* web_contents, bool proceed, bool* proceed_to_fire_unload) { -@@ -2091,12 +2178,24 @@ void Browser::WebContentsCreated(WebContents* source_contents, +@@ -2101,12 +2188,24 @@ void Browser::WebContentsCreated(WebContents* source_contents, // Make the tab show up in the task manager. task_manager::WebContentsTags::CreateForTabContents(new_contents); @@ -336,7 +336,7 @@ index 557abfcd71d85..fb64e93157148 100644 // Don't show the page hung dialog when a HTML popup hangs because // the dialog will take the focus and immediately close the popup. RenderWidgetHostView* view = render_widget_host->GetView(); -@@ -2109,6 +2208,13 @@ void Browser::RendererUnresponsive( +@@ -2119,6 +2218,13 @@ void Browser::RendererUnresponsive( void Browser::RendererResponsive( WebContents* source, content::RenderWidgetHost* render_widget_host) { @@ -350,7 +350,7 @@ index 557abfcd71d85..fb64e93157148 100644 RenderWidgetHostView* view = render_widget_host->GetView(); if (view && !render_widget_host->GetView()->IsHTMLFormPopup()) { TabDialogs::FromWebContents(source)->HideHungRendererDialog( -@@ -2118,6 +2224,15 @@ void Browser::RendererResponsive( +@@ -2128,6 +2234,15 @@ void Browser::RendererResponsive( content::JavaScriptDialogManager* Browser::GetJavaScriptDialogManager( WebContents* source) { @@ -366,7 +366,7 @@ index 557abfcd71d85..fb64e93157148 100644 return javascript_dialogs::TabModalDialogManager::FromWebContents(source); } -@@ -2153,6 +2268,11 @@ void Browser::DraggableRegionsChanged( +@@ -2163,6 +2278,11 @@ void Browser::DraggableRegionsChanged( if (app_controller_) { app_controller_->DraggableRegionsChanged(regions, contents); } @@ -378,7 +378,7 @@ index 557abfcd71d85..fb64e93157148 100644 } void Browser::DidFinishNavigation( -@@ -2233,11 +2353,15 @@ void Browser::EnterFullscreenModeForTab( +@@ -2243,11 +2363,15 @@ void Browser::EnterFullscreenModeForTab( const blink::mojom::FullscreenOptions& options) { exclusive_access_manager_->fullscreen_controller()->EnterFullscreenModeForTab( requesting_frame, options.display_id); @@ -394,7 +394,7 @@ index 557abfcd71d85..fb64e93157148 100644 } bool Browser::IsFullscreenForTabOrPending(const WebContents* web_contents) { -@@ -2437,6 +2561,15 @@ void Browser::RequestMediaAccessPermission( +@@ -2447,6 +2571,15 @@ void Browser::RequestMediaAccessPermission( content::WebContents* web_contents, const content::MediaStreamRequest& request, content::MediaResponseCallback callback) { @@ -410,7 +410,7 @@ index 557abfcd71d85..fb64e93157148 100644 const extensions::Extension* extension = GetExtensionForOrigin(profile_, request.security_origin); MediaCaptureDevicesDispatcher::GetInstance()->ProcessMediaAccessRequest( -@@ -2981,9 +3114,11 @@ void Browser::RemoveScheduledUpdatesFor(WebContents* contents) { +@@ -2991,9 +3124,11 @@ void Browser::RemoveScheduledUpdatesFor(WebContents* contents) { // Browser, Getters for UI (private): StatusBubble* Browser::GetStatusBubble() { @@ -423,7 +423,7 @@ index 557abfcd71d85..fb64e93157148 100644 } // We hide the status bar for web apps windows as this matches native -@@ -2991,6 +3126,12 @@ StatusBubble* Browser::GetStatusBubble() { +@@ -3001,6 +3136,12 @@ StatusBubble* Browser::GetStatusBubble() { // mode, as the minimal browser UI includes the status bar. if (web_app::AppBrowserController::IsWebApp(this) && !app_controller()->HasMinimalUiButtons()) { @@ -436,7 +436,7 @@ index 557abfcd71d85..fb64e93157148 100644 return nullptr; } -@@ -3140,6 +3281,8 @@ void Browser::SetAsDelegate(WebContents* web_contents, bool set_delegate) { +@@ -3150,6 +3291,8 @@ void Browser::SetAsDelegate(WebContents* web_contents, bool set_delegate) { BookmarkTabHelper::FromWebContents(web_contents)->RemoveObserver(this); web_contents_collection_.StopObserving(web_contents); } @@ -445,7 +445,7 @@ index 557abfcd71d85..fb64e93157148 100644 } void Browser::TabDetachedAtImpl(content::WebContents* contents, -@@ -3294,6 +3437,14 @@ bool Browser::PictureInPictureBrowserSupportsWindowFeature( +@@ -3304,6 +3447,14 @@ bool Browser::PictureInPictureBrowserSupportsWindowFeature( bool Browser::SupportsWindowFeatureImpl(WindowFeature feature, bool check_can_support) const { diff --git a/patch/patches/chrome_browser_download.patch b/patch/patches/chrome_browser_download.patch index d5a0d5a5c..807794588 100644 --- a/patch/patches/chrome_browser_download.patch +++ b/patch/patches/chrome_browser_download.patch @@ -1,8 +1,8 @@ diff --git chrome/browser/download/chrome_download_manager_delegate.cc chrome/browser/download/chrome_download_manager_delegate.cc -index 2628f1751cd14..cc2c330d8db5d 100644 +index bd2c41e30f01e..d87b8baf3de2b 100644 --- chrome/browser/download/chrome_download_manager_delegate.cc +++ chrome/browser/download/chrome_download_manager_delegate.cc -@@ -148,6 +148,10 @@ +@@ -150,6 +150,10 @@ #include "chrome/browser/safe_browsing/download_protection/download_protection_util.h" #endif @@ -13,7 +13,7 @@ index 2628f1751cd14..cc2c330d8db5d 100644 using content::BrowserThread; using content::DownloadManager; using download::DownloadItem; -@@ -492,6 +496,11 @@ ChromeDownloadManagerDelegate::ChromeDownloadManagerDelegate(Profile* profile) +@@ -500,6 +504,11 @@ ChromeDownloadManagerDelegate::ChromeDownloadManagerDelegate(Profile* profile) download_dialog_bridge_ = std::make_unique(); download_message_bridge_ = std::make_unique(); #endif @@ -25,7 +25,7 @@ index 2628f1751cd14..cc2c330d8db5d 100644 } ChromeDownloadManagerDelegate::~ChromeDownloadManagerDelegate() { -@@ -551,6 +560,9 @@ void ChromeDownloadManagerDelegate::Shutdown() { +@@ -559,6 +568,9 @@ void ChromeDownloadManagerDelegate::Shutdown() { download_manager_->RemoveObserver(this); download_manager_ = nullptr; } @@ -35,7 +35,7 @@ index 2628f1751cd14..cc2c330d8db5d 100644 } void ChromeDownloadManagerDelegate::OnDownloadCanceledAtShutdown( -@@ -619,6 +631,12 @@ bool ChromeDownloadManagerDelegate::DetermineDownloadTarget( +@@ -627,6 +639,12 @@ bool ChromeDownloadManagerDelegate::DetermineDownloadTarget( ReportPDFLoadStatus(PDFLoadStatus::kTriggeredNoGestureDriveByDownload); } diff --git a/patch/patches/chrome_browser_profiles.patch b/patch/patches/chrome_browser_profiles.patch index 0be8fadad..412e0f9cc 100644 --- a/patch/patches/chrome_browser_profiles.patch +++ b/patch/patches/chrome_browser_profiles.patch @@ -85,10 +85,10 @@ index 02454f4e780b5..4641f33c26f5f 100644 // Returns whether the user has signed in this profile to an account. diff --git chrome/browser/profiles/profile_impl.cc chrome/browser/profiles/profile_impl.cc -index 0909a332a46bf..163de8ef6a878 100644 +index 0d7b3e677f5d1..b2704259cdc43 100644 --- chrome/browser/profiles/profile_impl.cc +++ chrome/browser/profiles/profile_impl.cc -@@ -1030,7 +1030,9 @@ Profile* ProfileImpl::GetOffTheRecordProfile(const OTRProfileID& otr_profile_id, +@@ -1033,7 +1033,9 @@ Profile* ProfileImpl::GetOffTheRecordProfile(const OTRProfileID& otr_profile_id, otr_profiles_[otr_profile_id] = std::move(otr_profile); diff --git a/patch/patches/chrome_runtime.patch b/patch/patches/chrome_runtime.patch index 1f316897e..4f642cc1d 100644 --- a/patch/patches/chrome_runtime.patch +++ b/patch/patches/chrome_runtime.patch @@ -594,7 +594,7 @@ index 522c072575325..b63e9aacd1f0a 100644 #endif diff --git chrome/browser/prefs/browser_prefs.cc chrome/browser/prefs/browser_prefs.cc -index 7c9cd6b688f88..f66aa28081c37 100644 +index f48b25bb957d1..08ee4dd4b7e02 100644 --- chrome/browser/prefs/browser_prefs.cc +++ chrome/browser/prefs/browser_prefs.cc @@ -16,6 +16,7 @@ diff --git a/patch/patches/chrome_runtime_views.patch b/patch/patches/chrome_runtime_views.patch index 0108839ff..208845b0b 100644 --- a/patch/patches/chrome_runtime_views.patch +++ b/patch/patches/chrome_runtime_views.patch @@ -41,10 +41,10 @@ index e70c1340dd2ee..745b3982aa9ad 100644 bool BrowserCommandController::IsWebAppOrCustomTab() const { diff --git chrome/browser/ui/toolbar/app_menu_model.cc chrome/browser/ui/toolbar/app_menu_model.cc -index 2a1eb7cd0a644..b3e95b92b2951 100644 +index 4df6318daf016..8492d99fb42b2 100644 --- chrome/browser/ui/toolbar/app_menu_model.cc +++ chrome/browser/ui/toolbar/app_menu_model.cc -@@ -658,10 +658,12 @@ FindAndEditSubMenuModel::FindAndEditSubMenuModel( +@@ -673,10 +673,12 @@ FindAndEditSubMenuModel::FindAndEditSubMenuModel( ui::SimpleMenuModel::Delegate* delegate) : SimpleMenuModel(delegate) { AddItemWithStringIdAndVectorIcon(this, IDC_FIND, IDS_FIND, kSearchMenuIcon); @@ -57,7 +57,7 @@ index 2a1eb7cd0a644..b3e95b92b2951 100644 } class SaveAndShareSubMenuModel : public ui::SimpleMenuModel { -@@ -736,6 +738,57 @@ SaveAndShareSubMenuModel::SaveAndShareSubMenuModel( +@@ -751,6 +753,57 @@ SaveAndShareSubMenuModel::SaveAndShareSubMenuModel( } } @@ -115,7 +115,7 @@ index 2a1eb7cd0a644..b3e95b92b2951 100644 } // namespace //////////////////////////////////////////////////////////////////////////////// -@@ -1596,7 +1649,7 @@ bool AppMenuModel::IsCommandIdChecked(int command_id) const { +@@ -1632,7 +1685,7 @@ bool AppMenuModel::IsCommandIdChecked(int command_id) const { return false; } @@ -124,7 +124,7 @@ index 2a1eb7cd0a644..b3e95b92b2951 100644 GlobalError* error = GlobalErrorServiceFactory::GetForProfile(browser_->profile()) ->GetGlobalErrorByMenuItemCommandID(command_id); -@@ -1611,6 +1664,30 @@ bool AppMenuModel::IsCommandIdEnabled(int command_id) const { +@@ -1648,6 +1701,30 @@ bool AppMenuModel::IsCommandIdEnabled(int command_id) const { } } @@ -155,7 +155,7 @@ index 2a1eb7cd0a644..b3e95b92b2951 100644 bool AppMenuModel::IsCommandIdAlerted(int command_id) const { if (command_id == IDC_VIEW_PASSWORDS || command_id == IDC_SHOW_PASSWORD_MANAGER) { -@@ -1773,8 +1850,10 @@ void AppMenuModel::Build() { +@@ -1810,8 +1887,10 @@ void AppMenuModel::Build() { IDS_CLEAR_BROWSING_DATA, kTrashCanRefreshIcon); @@ -166,7 +166,7 @@ index 2a1eb7cd0a644..b3e95b92b2951 100644 AddSeparator(ui::NORMAL_SEPARATOR); AddItemWithStringIdAndVectorIcon(this, IDC_PRINT, IDS_PRINT, kPrintMenuIcon); -@@ -1896,6 +1975,11 @@ void AppMenuModel::Build() { +@@ -1933,6 +2012,11 @@ void AppMenuModel::Build() { } #endif // !BUILDFLAG(IS_CHROMEOS_ASH) diff --git a/patch/patches/views_1749_2102_3330.patch b/patch/patches/views_1749_2102_3330.patch index d986bc005..03ea2597c 100644 --- a/patch/patches/views_1749_2102_3330.patch +++ b/patch/patches/views_1749_2102_3330.patch @@ -1,8 +1,8 @@ diff --git chrome/browser/ui/views/toolbar/app_menu.cc chrome/browser/ui/views/toolbar/app_menu.cc -index 7986c86012518..fa75795aa6c30 100644 +index 0645d841f604c..0f5aa54288f5c 100644 --- chrome/browser/ui/views/toolbar/app_menu.cc +++ chrome/browser/ui/views/toolbar/app_menu.cc -@@ -1025,7 +1025,9 @@ void AppMenu::RunMenu(views::MenuButtonController* host) { +@@ -1037,7 +1037,9 @@ void AppMenu::RunMenu(views::MenuButtonController* host) { host->button()->GetWidget(), host, host->button()->GetAnchorBoundsInScreen(), views::MenuAnchorPosition::kTopRight, ui::MENU_SOURCE_NONE,