Skip to content

Upgrade from Chromium 127.0.6533.57 to Chromium 127.0.6533.73 (1.68.x) #24811

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jul 23, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -550,9 +550,9 @@ bool ParseCertificatesFile(std::string_view certs_input,
Pinsets* pinsets,
base::Time* timestamp) {
constexpr std::string_view brave_certs = R"brave_certs(
# Last updated: Wed Jul 17 18:15:04 UTC 2024
# Last updated: Tue Jul 23 20:31:34 UTC 2024
PinsListTimestamp
1721240104
1721766694

# =====BEGIN BRAVE ROOTS ASC=====
#From https://www.amazontrust.com/repository/
Expand Down
12 changes: 12 additions & 0 deletions components/compose_strings.grdp
Original file line number Diff line number Diff line change
Expand Up @@ -170,6 +170,18 @@
<message name="IDS_COMPOSE_RESULT_TEXT_LABEL" desc="Accesibility label for the area holding the result text.">
Result
</message>
<message name="IDS_COMPOSE_RESULT_LOADING_A11Y_MESSAGE" desc="Accessibility string read by screen readers on Mac when the result dialog is loading a new response." translateable="false">
Result loading
</message>
<message name="IDS_COMPOSE_RESULT_UPDATED_A11Y_MESSAGE" desc="Accessibility string read by screen readers when the text in the result dialog has changed." translateable="false">
Result updated
</message>
<message name="IDS_COMPOSE_UNDO_RESULT_A11Y_MESSAGE" desc="Accessibility string read by screen readers on Mac when the undo button in the result dialog has been pressed." translateable="false">
Undoing result
</message>
<message name="IDS_COMPOSE_REDO_RESULT_A11Y_MESSAGE" desc="Accessibility string read by screen readers on Mac when the redo button in the result dialog has been pressed." translateable="false">
Redoing result
</message>

<!-- Errors -->
<message name="IDS_COMPOSE_ERROR_TOO_SHORT" desc="Error that the input was too short.">
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@
"projects": {
"chrome": {
"dir": "src",
"tag": "127.0.6533.57",
"tag": "127.0.6533.73",
"repository": {
"url": "https://github.com/brave/chromium"
}
Expand Down
4 changes: 2 additions & 2 deletions patches/chrome-browser-about_flags.cc.patch
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
index f437577c606290f3465040665b3429079b9b7160..a8cbe0509d2e642507ee5f95695c2abdf332e905 100644
index ff1ed1a98cbfe8e6c24d64f308dd119c635d00d5..90461fbe019396650bb1d7d1407d2e964d502333 100644
--- a/chrome/browser/about_flags.cc
+++ b/chrome/browser/about_flags.cc
@@ -4113,6 +4113,7 @@ const FeatureEntry::FeatureVariation kAutofillUpstreamUpdatedUiOptions[] = {
Expand All @@ -10,7 +10,7 @@ index f437577c606290f3465040665b3429079b9b7160..a8cbe0509d2e642507ee5f95695c2abd
// Include generated flags for flag unexpiry; see //docs/flag_expiry.md and
// //tools/flags/generate_unexpire_flags.py.
#include "build/chromeos_buildflags.h"
@@ -11900,6 +11901,7 @@ void GetStorage(Profile* profile, GetStorageCallback callback) {
@@ -11906,6 +11907,7 @@ void GetStorage(Profile* profile, GetStorageCallback callback) {

bool ShouldSkipConditionalFeatureEntry(const flags_ui::FlagsStorage* storage,
const FeatureEntry& entry) {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
diff --git a/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc b/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc
index 838700a21091c16ce53921c9d9a5600daf4d766b..483f7a40f73aac2abbccbe46b5ea8b111d376061 100644
index fd011f8983a1d541b15163c11a9d8a70c249899a..fb9612042ce13dc35467d8c5aa8053e9b69382f3 100644
--- a/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc
+++ b/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc
@@ -857,6 +857,7 @@ void BookmarkBarView::Layout(PassKey) {
@@ -866,6 +866,7 @@ void BookmarkBarView::Layout(PassKey) {
x = next_x;
}
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
diff --git a/chrome/browser/ui/views/location_bar/icon_label_bubble_view.cc b/chrome/browser/ui/views/location_bar/icon_label_bubble_view.cc
index d03cdb7991dc483c2fc726d4fb365042389909c8..f7b54642510b03e4971f10c16622e88f63dcc909 100644
index a430e1a63cf6e8170b29708ffd61d714186a7fbf..8d4fb4fa6f063875e84875a3bf72cf3736e38f5b 100644
--- a/chrome/browser/ui/views/location_bar/icon_label_bubble_view.cc
+++ b/chrome/browser/ui/views/location_bar/icon_label_bubble_view.cc
@@ -727,6 +727,7 @@ SkPath IconLabelBubbleView::GetHighlightPath() const {
@@ -730,6 +730,7 @@ SkPath IconLabelBubbleView::GetHighlightPath() const {
const float corner_radius = highlight_bounds.height() / 2.f;
const SkRect rect = RectToSkRect(highlight_bounds);

Expand Down
Original file line number Diff line number Diff line change
@@ -1,24 +1,24 @@
diff --git a/chrome/browser/ui/views/location_bar/location_bar_view.cc b/chrome/browser/ui/views/location_bar/location_bar_view.cc
index a73def499ab3ebe3365e64e561b96f4aec06782d..eb220b1ac093a2874399db2a453ac9848f103359 100644
index c8b554ffbe853d26eed6cab557daa55f7112f182..427a01290a3972c0096b43ad3cf2708d9bd5088c 100644
--- a/chrome/browser/ui/views/location_bar/location_bar_view.cc
+++ b/chrome/browser/ui/views/location_bar/location_bar_view.cc
@@ -705,6 +705,7 @@ void LocationBarView::Layout(PassKey) {
@@ -714,6 +714,7 @@ void LocationBarView::Layout(PassKey) {
// Indentation add padding when the permission chip is visible and replacing
// the LHS icon.
int text_overriding_permission_chip_indent = 0;
+ BRAVE_LAYOUT_LEADING_DECORATIONS
if (should_indent) {
icon_left += icon_indent;
text_left += text_indent;
@@ -791,6 +792,7 @@ void LocationBarView::Layout(PassKey) {
@@ -801,6 +802,7 @@ void LocationBarView::Layout(PassKey) {
}
};

+ BRAVE_LAYOUT_RIGHT_MOST_TRAILING_DECORATIONS
add_trailing_decoration(page_action_icon_container_,
/*intra_item_padding=*/0);
for (ContentSettingImageView* view : base::Reversed(content_setting_views_)) {
@@ -804,6 +806,7 @@ void LocationBarView::Layout(PassKey) {
@@ -814,6 +816,7 @@ void LocationBarView::Layout(PassKey) {
}

add_trailing_decoration(clear_all_button_, /*intra_item_padding=*/0);
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
diff --git a/third_party/blink/renderer/modules/canvas/canvas2d/base_rendering_context_2d.cc b/third_party/blink/renderer/modules/canvas/canvas2d/base_rendering_context_2d.cc
index 9587913ad7dd1e93add27147c152c78c9ca0506d..8a77cc4dea63d080dfc92b5470b03b30804a6464 100644
index cc8076306da164f4d338595c4086adcdd60563cc..5d1f0b42daaf89b8273a7701d62c1eb8194f56f7 100644
--- a/third_party/blink/renderer/modules/canvas/canvas2d/base_rendering_context_2d.cc
+++ b/third_party/blink/renderer/modules/canvas/canvas2d/base_rendering_context_2d.cc
@@ -2576,6 +2576,7 @@ ImageData* BaseRenderingContext2D::getImageData(
Expand Down
Loading