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 121.0.6167.85 to Chromium 121.0.6167.139 (1.62.x) #21824

Merged
merged 3 commits into from
Jan 31, 2024
Merged

Upgrade from Chromium 121.0.6167.85 to Chromium 121.0.6167.139 (1.62.x) #21824

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
9ed098a
Upgrade from Chromium 121.0.6167.85 to Chromium 121.0.6167.139
brave-builds Jan 30, 2024
7b5e4ce
Update pins list timestamp
brave-builds Jan 30, 2024
753ff1d
Disable upstream test that's failing due to DIPS being disabled
emerick Jan 30, 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 @@ -549,9 +549,9 @@ bool ParseCertificatesFile(std::string_view certs_input,
Pinsets* pinsets,
base::Time* timestamp) {
constexpr std::string_view brave_certs = R"brave_certs(
# Last updated: Mon Jan 22 18:14:55 UTC 2024
# Last updated: Tue Jan 30 20:48:50 UTC 2024
PinsListTimestamp
1705947295
1706647730

# =====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 @@ -268,7 +268,7 @@
"projects": {
"chrome": {
"dir": "src",
"tag": "121.0.6167.85",
"tag": "121.0.6167.139",
"repository": {
"url": "https://github.com/brave/chromium"
}
Expand Down
4 changes: 2 additions & 2 deletions patches/chrome-browser-content_settings-page_specific_content_settings_delegate.cc.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
diff --git a/chrome/browser/content_settings/page_specific_content_settings_delegate.cc b/chrome/browser/content_settings/page_specific_content_settings_delegate.cc
index d704da3fbdb4b31096514d1660bee4558ab60c06..85a27897312449e31c0d77baf00dd6cd993b5ba8 100644
index 9364012ed30dc2ee55b2985a406ffc781faa53ec..7342c4e63c818a306d398a3ce411229a0710613c 100644
--- a/chrome/browser/content_settings/page_specific_content_settings_delegate.cc
+++ b/chrome/browser/content_settings/page_specific_content_settings_delegate.cc
@@ -169,6 +169,7 @@ void GetGuestViewDefaultContentSettingRules(
@@ -175,6 +175,7 @@ void GetGuestViewDefaultContentSettingRules(
ContentSettingsPattern::Wildcard(), ContentSettingsPattern::Wildcard(),
content_settings::ContentSettingToValue(CONTENT_SETTING_BLOCK),
std::string(), incognito));
Expand Down
4 changes: 2 additions & 2 deletions patches/components-content_settings-core-common-cookie_settings_base.cc.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
diff --git a/components/content_settings/core/common/cookie_settings_base.cc b/components/content_settings/core/common/cookie_settings_base.cc
index 3645242f7f22de9280271a3f14e52c157d1840a4..31f9aafa935768f4aa30dbef535029f4ee8df9b2 100644
index 38717762c6c4e0a53a1c686df891adce2af7e4a3..d6fa564ba9ab49afccb1bc384cfca588cc71c4f8 100644
--- a/components/content_settings/core/common/cookie_settings_base.cc
+++ b/components/content_settings/core/common/cookie_settings_base.cc
@@ -319,6 +319,7 @@ CookieSettingsBase::GetCookieSettingInternal(
@@ -324,6 +324,7 @@ CookieSettingsBase::GetCookieSettingInternal(
IsAllowed(setting) && !is_explicit_setting && is_third_party_request &&
block_by_global_setting &&
!IsThirdPartyCookiesAllowedScheme(first_party_url.scheme());
Expand Down
4 changes: 2 additions & 2 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,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 6a4e888be30646b513f5183091dab38fd4335ac6..869d4ea7f63e346318b8383ae476bc86610329df 100644
index 2816652e88f9cb86ffa68f84002eb749837398d7..9a9ed35666f8e4837b0afb2c373d8b68f9eb6542 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
@@ -2072,6 +2072,7 @@ ImageData* BaseRenderingContext2D::getImageData(
Expand All @@ -18,7 +18,7 @@ index 6a4e888be30646b513f5183091dab38fd4335ac6..869d4ea7f63e346318b8383ae476bc86

return image_data;
}
@@ -2901,6 +2903,7 @@ TextMetrics* BaseRenderingContext2D::measureText(const String& text) {
@@ -2878,6 +2880,7 @@ TextMetrics* BaseRenderingContext2D::measureText(const String& text) {
return MakeGarbageCollected<TextMetrics>();
}

Expand Down
2 changes: 1 addition & 1 deletion patches/third_party-blink-renderer-platform-BUILD.gn.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/BUILD.gn b/third_party/blink/renderer/platform/BUILD.gn
index 5384dbc70363005f477cb80be0c22190f5724118..73580f8638b177d9adc290c0cf447d3ed6c123d9 100644
index 130975880421a4c81875b21ee42fa56039b6d167..8d55f2150f290bea371a313121426164f669ca93 100644
--- a/third_party/blink/renderer/platform/BUILD.gn
+++ b/third_party/blink/renderer/platform/BUILD.gn
@@ -1845,6 +1845,7 @@ component("platform") {
Expand Down
1 change: 1 addition & 0 deletions test/filters/browser_tests.filter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -773,6 +773,7 @@
-DisallowManagedProfileSignoutFeature/UserPolicySigninServiceTest.*

# These tests fail because we disable DIPS via features::kDIPS
-All/DIPSPrivacySandboxDataTest.DontClearAttributionReportingApiData/*
-All/OpenerHeuristicBackfillGrantBrowserTest.TrackingProtectionOnboardingCreatesBackfillGrants/*
-All/OpenerHeuristicCurrentInteractionGrantBrowserTest.AdTaggedPopupInteractionWithStorageAccessGrant/*
-All/OpenerHeuristicCurrentInteractionGrantBrowserTest.PopupInteractionWithStorageAccessGrant/*
Expand Down
Loading