From 80ef3d35dbc3b0eb59d314cda13987c98eb2d075 Mon Sep 17 00:00:00 2001 From: Emerick Rogul Date: Tue, 10 Dec 2024 21:05:01 -0500 Subject: [PATCH] Upgrade from Chromium 131.0.6778.108 to Chromium 131.0.6778.139 (1.73.x) (#26973) * Upgrade from Chromium 131.0.6778.108 to Chromium 131.0.6778.139 * Update pins list timestamp * [cr132] Revert "[cr131] `Tab::set_group` => `Tab::SetGroup`" This reverts commit d9a3fa1250b65923c9ef671dfb276d1a5dd7191d. This got reverted in upstream Chromium change: https://chromium.googlesource.com/chromium/src/+/1eadd223cce221615fa18db6647451a26a0315a2 commit bf601391652cebeaae149fab39eda062a5f28732 Author: Nasko Oskov Date: Thu Oct 31 16:57:50 2024 +0000 Revert "[views-ax] Migration of kName attribute in Tab" This reverts commit 1eadd223cce221615fa18db6647451a26a0315a2. Reason for revert: This CL has regressed window name availability to a11y APIs - https://crbug.com/374947846. Original change's description: > [views-ax] Migration of kName attribute in Tab > > This CL migrates the kName attribute in views to be updated > whenever its value should change, rather than querying the value > and computing it only when needed. > > As part of this change, the following views are updated: > Tab, BrowserView, PermissionChipView, and TabSlotView. The Tab > class extends TabSlotView. BrowserView::GetAccessibleTabLabel > constructs the accessible name for a tab by gathering various > properties such as the title, group, memory usage, and possibly > other elements like permission chips, to create a comprehensive > and accurate label. > > This CL is part of the ViewsAX project: > https://docs.google.com/document/d/1Ku7HOyDsiZem1yaV6ccZ-tz3lO2XR2NEcm8HjR6d-VY/edit#heading=h.ke1u3utej413 > > Bug: 325137417 > Change-Id: Id1ca1da2e970c82575dff12bd48434f716d4548f > Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5836477 > Reviewed-by: Jacques Newman > Commit-Queue: Gaurav Kumar > Reviewed-by: Elly FJ > Cr-Commit-Position: refs/heads/main@{#1367340} Bug: 325137417 --------- Co-authored-by: brave-builds Co-authored-by: Claudio DeSouza --- browser/ui/views/tabs/brave_tab.cc | 2 +- browser/ui/views/tabs/brave_tab_container.cc | 2 +- browser/ui/views/tabs/brave_tab_strip.cc | 2 +- .../input_file_parsers.cc | 4 ++-- package.json | 2 +- patches/chrome-browser-BUILD.gn.patch | 2 +- ...r_context_menu-render_view_context_menu.cc.patch | 2 +- patches/chrome-browser-ui-browser.cc.patch | 2 +- patches/chrome-browser-ui-views-tabs-tab.cc.patch | 8 ++++---- ...e-browser-ui-views-tabs-tab_group_views.cc.patch | 4 ++-- .../chrome-browser-ui-views-tabs-tab_strip.cc.patch | 2 +- ...ird_party-blink-renderer-platform-BUILD.gn.patch | 4 ++-- ...er-platform-runtime_enabled_features.json5.patch | 2 +- ...ui-accessibility-accessibility_features.cc.patch | 13 ------------- 14 files changed, 19 insertions(+), 32 deletions(-) delete mode 100644 patches/ui-accessibility-accessibility_features.cc.patch diff --git a/browser/ui/views/tabs/brave_tab.cc b/browser/ui/views/tabs/brave_tab.cc index 73aec7724d6f..309682b52b29 100644 --- a/browser/ui/views/tabs/brave_tab.cc +++ b/browser/ui/views/tabs/brave_tab.cc @@ -208,6 +208,6 @@ void BraveTab::SetData(TabRendererData data) { if (data_changed && tabs::utils::ShouldShowVerticalTabs(controller()->GetBrowser()) && data_.pinned) { - SetGroup(std::nullopt); + set_group(std::nullopt); } } diff --git a/browser/ui/views/tabs/brave_tab_container.cc b/browser/ui/views/tabs/brave_tab_container.cc index 0959c30eec98..e5c4930b9d92 100644 --- a/browser/ui/views/tabs/brave_tab_container.cc +++ b/browser/ui/views/tabs/brave_tab_container.cc @@ -404,7 +404,7 @@ void BraveTabContainer::SetTabSlotVisibility() { for (Tab* tab : layout_helper_->GetTabs()) { if (std::optional group = tab->group(); group && !base::Contains(group_views_, *group)) { - tab->SetGroup(std::nullopt); + tab->set_group(std::nullopt); } } diff --git a/browser/ui/views/tabs/brave_tab_strip.cc b/browser/ui/views/tabs/brave_tab_strip.cc index dbdb7b2ac568..0f81a05e3070 100644 --- a/browser/ui/views/tabs/brave_tab_strip.cc +++ b/browser/ui/views/tabs/brave_tab_strip.cc @@ -328,7 +328,7 @@ void BraveTabStrip::UpdateTabContainer() { auto* tab = original_container->GetTabAtModelIndex(i); // At this point, we don't have group views in the container. So before // restoring groups, clears group for tabs. - tab->SetGroup(std::nullopt); + tab->set_group(std::nullopt); tab_container_->AddTab( tab->parent()->RemoveChildViewT(tab), i, tab->data().pinned ? TabPinned::kPinned : TabPinned::kUnpinned); diff --git a/chromium_src/net/tools/transport_security_state_generator/input_file_parsers.cc b/chromium_src/net/tools/transport_security_state_generator/input_file_parsers.cc index 15c03e038ceb..84db1e3ed3b5 100644 --- a/chromium_src/net/tools/transport_security_state_generator/input_file_parsers.cc +++ b/chromium_src/net/tools/transport_security_state_generator/input_file_parsers.cc @@ -561,9 +561,9 @@ bool ParseCertificatesFile(std::string_view certs_input, Pinsets* pinsets, base::Time* timestamp) { constexpr std::string_view brave_certs = R"brave_certs( -# Last updated: Tue Dec 3 19:33:41 UTC 2024 +# Last updated: Tue Dec 10 22:53:03 UTC 2024 PinsListTimestamp -1733254421 +1733871183 # =====BEGIN BRAVE ROOTS ASC===== #From https://www.amazontrust.com/repository/ diff --git a/package.json b/package.json index c7cb3cdc2618..dd07e9cc51d7 100644 --- a/package.json +++ b/package.json @@ -68,7 +68,7 @@ "projects": { "chrome": { "dir": "src", - "tag": "131.0.6778.108", + "tag": "131.0.6778.139", "repository": { "url": "https://github.com/brave/chromium" } diff --git a/patches/chrome-browser-BUILD.gn.patch b/patches/chrome-browser-BUILD.gn.patch index 363c5690c948..2ef77ffb687c 100644 --- a/patches/chrome-browser-BUILD.gn.patch +++ b/patches/chrome-browser-BUILD.gn.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn -index 54279426733f7eeec00ee2ccf7c82771ae424c65..6cb0f560164665f7744986a2a425be4d30858632 100644 +index 8aa3f2bd53970db805f41ae0b46f16a8547666e7..9cc615ca87f90fcf2fb109b350d2e96f94c9067b 100644 --- a/chrome/browser/BUILD.gn +++ b/chrome/browser/BUILD.gn @@ -2517,6 +2517,7 @@ static_library("browser") { diff --git a/patches/chrome-browser-renderer_context_menu-render_view_context_menu.cc.patch b/patches/chrome-browser-renderer_context_menu-render_view_context_menu.cc.patch index 363ef01f5118..b2673eb02da8 100644 --- a/patches/chrome-browser-renderer_context_menu-render_view_context_menu.cc.patch +++ b/patches/chrome-browser-renderer_context_menu-render_view_context_menu.cc.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/renderer_context_menu/render_view_context_menu.cc b/chrome/browser/renderer_context_menu/render_view_context_menu.cc -index 31f179bf8f410adfffaa540f4b0f0b84c8a32fea..b4e769b8ab905560c84f27f72152859f9dd94a14 100644 +index eda9a7b2662b11ef476c4cabbf87b7c2231d0c22..d43b8e431114ace643d2196b15af7dc2c14a7f1d 100644 --- a/chrome/browser/renderer_context_menu/render_view_context_menu.cc +++ b/chrome/browser/renderer_context_menu/render_view_context_menu.cc @@ -2414,6 +2414,7 @@ void RenderViewContextMenu::AppendSearchProvider() { diff --git a/patches/chrome-browser-ui-browser.cc.patch b/patches/chrome-browser-ui-browser.cc.patch index 3e4388297462..72e9443dee72 100644 --- a/patches/chrome-browser-ui-browser.cc.patch +++ b/patches/chrome-browser-ui-browser.cc.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/ui/browser.cc b/chrome/browser/ui/browser.cc -index df205a82b34c48aba5ffc1b27f834613343cfaa1..c39800cb0a6f9446fdcf58bc61b9af595687a0f6 100644 +index 3ea7f6115a0e570e0294bd473d39e215233ecdd9..1d67ff0f8f89e6b8e387deeb1ccf763e39297641 100644 --- a/chrome/browser/ui/browser.cc +++ b/chrome/browser/ui/browser.cc @@ -527,6 +527,7 @@ Browser* Browser::Create(const CreateParams& params) { diff --git a/patches/chrome-browser-ui-views-tabs-tab.cc.patch b/patches/chrome-browser-ui-views-tabs-tab.cc.patch index 0c189e81bf43..4826d1a0056c 100644 --- a/patches/chrome-browser-ui-views-tabs-tab.cc.patch +++ b/patches/chrome-browser-ui-views-tabs-tab.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/ui/views/tabs/tab.cc b/chrome/browser/ui/views/tabs/tab.cc -index e6c3f149b641ee6333c5437a5c35cdc64ab42d5c..665f9e5c1db2d259d15bf3d3c2682b919db8a7c8 100644 +index 3295d8d9c1443b6486cf8369fcbb07be0aa0c13b..aefe04e0142055c7f815920a192cb217e1ff6289 100644 --- a/chrome/browser/ui/views/tabs/tab.cc +++ b/chrome/browser/ui/views/tabs/tab.cc -@@ -326,6 +326,7 @@ void Tab::Layout(PassKey) { +@@ -325,6 +325,7 @@ void Tab::Layout(PassKey) { // indicator, but visually it will be smaller at kFaviconSize wide. gfx::Rect favicon_bounds(start, contents_rect.y(), 0, 0); if (showing_icon_) { @@ -10,7 +10,7 @@ index e6c3f149b641ee6333c5437a5c35cdc64ab42d5c..665f9e5c1db2d259d15bf3d3c2682b91 if (center_icon_) { // When centering the favicon, the favicon is allowed to escape the normal // contents rect. -@@ -425,6 +426,7 @@ void Tab::Layout(PassKey) { +@@ -424,6 +425,7 @@ void Tab::Layout(PassKey) { int title_right = contents_rect.right(); if (showing_alert_indicator_) { title_right = alert_indicator_button_->x() - after_title_padding; @@ -18,7 +18,7 @@ index e6c3f149b641ee6333c5437a5c35cdc64ab42d5c..665f9e5c1db2d259d15bf3d3c2682b91 } else if (showing_close_button_) { // Allow the title to overlay the close button's empty border padding. title_right = close_x - after_title_padding; -@@ -1143,6 +1145,7 @@ void Tab::UpdateIconVisibility() { +@@ -1106,6 +1108,7 @@ void Tab::UpdateIconVisibility() { !controller_->IsLockedForOnTask() && #endif large_enough_for_close_button; diff --git a/patches/chrome-browser-ui-views-tabs-tab_group_views.cc.patch b/patches/chrome-browser-ui-views-tabs-tab_group_views.cc.patch index 22089e185e8b..c6f08d39a732 100644 --- a/patches/chrome-browser-ui-views-tabs-tab_group_views.cc.patch +++ b/patches/chrome-browser-ui-views-tabs-tab_group_views.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/ui/views/tabs/tab_group_views.cc b/chrome/browser/ui/views/tabs/tab_group_views.cc -index b5b49abff4d9ac680586d48cd7ebfc13bf36e687..2f5d84956e7c3a7aa15761f5207b10895ea0b1de 100644 +index a1a63e801871c7e5d22762278bf562d20711b8cb..e17fa9419b8f28dd519a44c2fdb4dcf6c4719355 100644 --- a/chrome/browser/ui/views/tabs/tab_group_views.cc +++ b/chrome/browser/ui/views/tabs/tab_group_views.cc -@@ -166,6 +166,7 @@ TabGroupViews::GetLeadingTrailingGroupViews( +@@ -164,6 +164,7 @@ TabGroupViews::GetLeadingTrailingGroupViews( views::View* trailing_child = nullptr; gfx::Rect trailing_child_widget_bounds; diff --git a/patches/chrome-browser-ui-views-tabs-tab_strip.cc.patch b/patches/chrome-browser-ui-views-tabs-tab_strip.cc.patch index f3a0e949af0c..998d2879d991 100644 --- a/patches/chrome-browser-ui-views-tabs-tab_strip.cc.patch +++ b/patches/chrome-browser-ui-views-tabs-tab_strip.cc.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/ui/views/tabs/tab_strip.cc b/chrome/browser/ui/views/tabs/tab_strip.cc -index 5ae9f8a1b2aa73e4787efabbfdb9776d74c3d56a..11019dba37a657eb6b104cca4d320f0cfc4d6f99 100644 +index 624029d689a598a90a5bfa1047d17dbf020e1f76..80f711927e938da1de149a386169eae3cfcc40f0 100644 --- a/chrome/browser/ui/views/tabs/tab_strip.cc +++ b/chrome/browser/ui/views/tabs/tab_strip.cc @@ -546,6 +546,7 @@ class TabStrip::TabDragContextImpl : public TabDragContext, diff --git a/patches/third_party-blink-renderer-platform-BUILD.gn.patch b/patches/third_party-blink-renderer-platform-BUILD.gn.patch index 2e62132e9d02..78ff770375b0 100644 --- a/patches/third_party-blink-renderer-platform-BUILD.gn.patch +++ b/patches/third_party-blink-renderer-platform-BUILD.gn.patch @@ -1,8 +1,8 @@ diff --git a/third_party/blink/renderer/platform/BUILD.gn b/third_party/blink/renderer/platform/BUILD.gn -index 7e9b09340fb856eea3c80735a4917fff5bac11f5..01a44882648d0f2c5fccd60856c802132feb1464 100644 +index b80735ad3f7e2bd377737f1aa9eaeb9b7f05bc41..ef81d605e7b7c0b52c28445686cbb9c080d9a4e5 100644 --- a/third_party/blink/renderer/platform/BUILD.gn +++ b/third_party/blink/renderer/platform/BUILD.gn -@@ -1927,6 +1927,7 @@ component("platform") { +@@ -1929,6 +1929,7 @@ component("platform") { configs -= [ "//build/config/compiler:default_symbols" ] configs += blink_symbols_config diff --git a/patches/third_party-blink-renderer-platform-runtime_enabled_features.json5.patch b/patches/third_party-blink-renderer-platform-runtime_enabled_features.json5.patch index 487d2f4c29bf..24e8749f44f2 100644 --- a/patches/third_party-blink-renderer-platform-runtime_enabled_features.json5.patch +++ b/patches/third_party-blink-renderer-platform-runtime_enabled_features.json5.patch @@ -1,5 +1,5 @@ diff --git a/third_party/blink/renderer/platform/runtime_enabled_features.json5 b/third_party/blink/renderer/platform/runtime_enabled_features.json5 -index b058b1cefd878eedeed656784a33448939c76a16..2a36d76799df6d3ebfa2d5260197a72fc915502c 100644 +index 298f1e0b95e6148e75e2ec2f30491935ed83a2fc..5a4ab1bd428bbf343b87dfb2d1f0574ca48ea566 100644 --- a/third_party/blink/renderer/platform/runtime_enabled_features.json5 +++ b/third_party/blink/renderer/platform/runtime_enabled_features.json5 @@ -1952,6 +1952,7 @@ diff --git a/patches/ui-accessibility-accessibility_features.cc.patch b/patches/ui-accessibility-accessibility_features.cc.patch deleted file mode 100644 index 53bcf829b726..000000000000 --- a/patches/ui-accessibility-accessibility_features.cc.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/ui/accessibility/accessibility_features.cc b/ui/accessibility/accessibility_features.cc -index e265c2d964a20c00003bfbb5ee8640ba42d1ea7f..9f79da8b69b93916728e3223d4b761d624babe26 100644 ---- a/ui/accessibility/accessibility_features.cc -+++ b/ui/accessibility/accessibility_features.cc -@@ -54,7 +54,7 @@ bool IsAccessibilityPruneRedundantInlineConnectivityEnabled() { - - BASE_FEATURE(kImageDescriptionsAlternateRouting, - "ImageDescriptionsAlternateRouting", -- base::FEATURE_ENABLED_BY_DEFAULT); -+ base::FEATURE_DISABLED_BY_DEFAULT); - bool IsImageDescriptionsAlternateRoutingEnabled() { - return base::FeatureList::IsEnabled( - ::features::kImageDescriptionsAlternateRouting);