Skip to content
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.

Sign up for GitHub

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

Upgrade from Chromium 131.0.6778.85 to Chromium 131.0.6778.108 (1.74.x) #26838

Merged
merged 3 commits into from
Dec 4, 2024
Merged

Upgrade from Chromium 131.0.6778.85 to Chromium 131.0.6778.108 (1.74.x) #26838

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a7573e0
Upgrade from Chromium 131.0.6778.85 to Chromium 131.0.6778.108
brave-builds Dec 3, 2024
104c47d
Update pins list timestamp
brave-builds Dec 3, 2024
083ed89
Disable additional failing upstream AutofillBubbleSignInPromoControll…
emerick Dec 3, 2024
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
4 changes: 2 additions & 2 deletions chromium_src/net/tools/transport_security_state_generator/input_file_parsers.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -554,9 +554,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 Nov 19 19:33:22 UTC 2024
# Last updated: Tue Dec 3 19:46:08 UTC 2024
PinsListTimestamp
1732044802
1733255168

# =====BEGIN BRAVE ROOTS ASC=====
#From https://www.amazontrust.com/repository/
Expand Down
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@
"projects": {
"chrome": {
"dir": "src",
"tag": "131.0.6778.85",
"tag": "131.0.6778.108",
"repository": {
"url": "https://github.com/brave/chromium"
}
Expand Down
4 changes: 2 additions & 2 deletions patches/ios-chrome-app-BUILD.gn.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
diff --git a/ios/chrome/app/BUILD.gn b/ios/chrome/app/BUILD.gn
index 2aa2d5b2ef8dafb1c490c72506c18c0be75749e0..dbe60e80a816090858f14d687427375a17e6ffef 100644
index 52839e164f263a0fe36535c025cda7f0a79986e6..3149a6330290641f124dd97841b68909ace67e39 100644
--- a/ios/chrome/app/BUILD.gn
+++ b/ios/chrome/app/BUILD.gn
@@ -842,8 +842,7 @@ chrome_app("chrome") {
@@ -843,8 +843,7 @@ chrome_app("chrome") {
# (see https://crbug.com/1394553 for details of the build failure). This
# is a stop-gap solution.
if (target_environment == "catalyst" ||
Expand Down
8 changes: 4 additions & 4 deletions ...hes/third_party-blink-renderer-modules-canvas-canvas2d-base_rendering_context_2d.cc.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,24 +1,24 @@
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 4c84fe3d2dacfe8c5981e23e9383e9cbaf4cb5fe..9e6e18311a3f0b9150ec27c81de944d0461f1c56 100644
index d97b5f83a189b93eeece8f565a9a38ea5c41f27b..114dd64fc5cd5b626906c5f76432ad230217a321 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
@@ -2756,6 +2756,7 @@ ImageData* BaseRenderingContext2D::getImageData(
@@ -2746,6 +2746,7 @@ ImageData* BaseRenderingContext2D::getImageData(
perfetto::EventContext GetEventContext();

ImageData* BaseRenderingContext2D::getImageDataInternal(
+ BRAVE_GET_IMAGE_DATA_PARAMS
int sx,
int sy,
int sw,
@@ -2929,6 +2930,7 @@ ImageData* BaseRenderingContext2D::getImageDataInternal(
@@ -2919,6 +2920,7 @@ ImageData* BaseRenderingContext2D::getImageDataInternal(
DCHECK(!bounds.intersect(SkIRect::MakeXYWH(sx, sy, sw, sh)));
}
}
+ BRAVE_GET_IMAGE_DATA

return image_data;
}
@@ -3609,6 +3611,7 @@ TextMetrics* BaseRenderingContext2D::measureText(const String& text) {
@@ -3599,6 +3601,7 @@ TextMetrics* BaseRenderingContext2D::measureText(const String& text) {
return MakeGarbageCollected<TextMetrics>();
}

Expand Down
2 changes: 1 addition & 1 deletion patches/third_party-blink-renderer-platform-runtime_enabled_features.json5.patch
View file
Open in desktop
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 3690123883164a2745e3ea09d2dc99569399d6b0..41541bcb00cc4942aabd9840143cb7cafae3954a 100644
index b058b1cefd878eedeed656784a33448939c76a16..2a36d76799df6d3ebfa2d5260197a72fc915502c 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
3 changes: 3 additions & 0 deletions test/filters/unit_tests.filter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,9 @@

# This test fails because of the following CHECK in identity_test_utils.cc:
# identity_manager->AreRefreshTokensLoaded()
-AutofillBubbleSignInPromoControllerTest.DoesNotMovePasswordUponSignInWithExistingAccountAndPasswordsDisabled
-AutofillBubbleSignInPromoControllerTest.DoesNotMovePasswordWhenSyncServiceIsInactive
-AutofillBubbleSignInPromoControllerTest.MovesPasswordUponSignInWithExistingAccountAndPasswordsEnabled
-AutofillBubbleSignInPromoControllerTest.RunsCallbackUponSignInWithExistingAccount

# This test fails because we don't use kChromeUINewTabPageThirdPartyURL
Expand Down
Loading