Skip to content

Commit

Permalink
Upgrade from Chromium 131.0.6778.108 to Chromium 131.0.6778.139 (1.73…
Browse files Browse the repository at this point in the history
….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 d9a3fa1.

This got reverted in upstream

Chromium change:
https://chromium.googlesource.com/chromium/src/+/1eadd223cce221615fa18db6647451a26a0315a2

commit bf601391652cebeaae149fab39eda062a5f28732
Author: Nasko Oskov <[email protected]>
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 <[email protected]>
    > Commit-Queue: Gaurav Kumar <[email protected]>
    > Reviewed-by: Elly FJ <[email protected]>
    > Cr-Commit-Position: refs/heads/main@{#1367340}

    Bug: 325137417

---------

Co-authored-by: brave-builds <[email protected]>
Co-authored-by: Claudio DeSouza <[email protected]>
  • Loading branch information
3 people authored Dec 11, 2024
1 parent 08d54cb commit 80ef3d3
Show file tree
Hide file tree
Showing 14 changed files with 19 additions and 32 deletions.
2 changes: 1 addition & 1 deletion browser/ui/views/tabs/brave_tab.cc
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
}
2 changes: 1 addition & 1 deletion browser/ui/views/tabs/brave_tab_container.cc
Original file line number Diff line number Diff line change
Expand Up @@ -404,7 +404,7 @@ void BraveTabContainer::SetTabSlotVisibility() {
for (Tab* tab : layout_helper_->GetTabs()) {
if (std::optional<tab_groups::TabGroupId> group = tab->group();
group && !base::Contains(group_views_, *group)) {
tab->SetGroup(std::nullopt);
tab->set_group(std::nullopt);
}
}

Expand Down
2 changes: 1 addition & 1 deletion browser/ui/views/tabs/brave_tab_strip.cc
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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/
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
Expand Down
2 changes: 1 addition & 1 deletion patches/chrome-browser-BUILD.gn.patch
Original file line number Diff line number Diff line change
@@ -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") {
Expand Down
Original file line number Diff line number Diff line change
@@ -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() {
Expand Down
2 changes: 1 addition & 1 deletion patches/chrome-browser-ui-browser.cc.patch
Original file line number Diff line number Diff line change
@@ -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) {
Expand Down
8 changes: 4 additions & 4 deletions patches/chrome-browser-ui-views-tabs-tab.cc.patch
Original file line number Diff line number Diff line change
@@ -1,24 +1,24 @@
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_) {
+ BRAVE_UI_VIEWS_TABS_TAB_LAYOUT_ADJUST_ICON_POSITION
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;
+ BRAVE_UI_VIEWS_TABS_TAB_ALERT_INDICATOR_POSITION
} 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;
Expand Down
4 changes: 2 additions & 2 deletions patches/chrome-browser-ui-views-tabs-tab_group_views.cc.patch
Original file line number Diff line number Diff line change
@@ -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;

Expand Down
2 changes: 1 addition & 1 deletion patches/chrome-browser-ui-views-tabs-tab_strip.cc.patch
Original file line number Diff line number Diff line change
@@ -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,
Expand Down
4 changes: 2 additions & 2 deletions patches/third_party-blink-renderer-platform-BUILD.gn.patch
Original file line number Diff line number Diff line change
@@ -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
Expand Down
Original file line number Diff line number Diff line change
@@ -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 @@
Expand Down
13 changes: 0 additions & 13 deletions patches/ui-accessibility-accessibility_features.cc.patch

This file was deleted.

0 comments on commit 80ef3d3

Please sign in to comment.