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

Jump to bottom

Upgrade from Chromium 120.0.6099.217 to Chromium 120.0.6099.234 (1.62.x). #21592

Merged
merged 2 commits into from
Jan 17, 2024
Merged

Upgrade from Chromium 120.0.6099.217 to Chromium 120.0.6099.234 (1.62.x). #21592

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1747c40
Upgrade from Chromium 120.0.6099.217 to Chromium 120.0.6099.234
brave-builds Jan 16, 2024
92a4e1c
Update pins list timestamp
brave-builds Jan 16, 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: Wed Jan 10 01:12:59 UTC 2024
# Last updated: Tue Jan 16 19:43:34 UTC 2024
PinsListTimestamp
1704849179
1705434214

# =====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": "120.0.6099.217",
"tag": "120.0.6099.234",
"repository": {
"url": "https://github.com/brave/chromium"
}
Expand Down
2 changes: 1 addition & 1 deletion patches/chrome-browser-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/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
index 44d3b5e543101ce7ff5fed778fc430532e7ae9fb..6e0a2a80b323e73fadff770182e7451182fdff3e 100644
index cd46c4c79d47637d3b1364a44f6b2fb54976a979..6f5ceb416c8713733e18987026e16259221e520c 100644
--- a/chrome/browser/BUILD.gn
+++ b/chrome/browser/BUILD.gn
@@ -2723,6 +2723,7 @@ static_library("browser") {
Expand Down
4 changes: 2 additions & 2 deletions patches/content-browser-web_contents-web_contents_impl.cc.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
index 63eafd910dad5686ca4114468e4563082821dd01..a016dff36acc45a0ecf16deb6941d0d2f3c860c6 100644
index dba3fa7b487fe9fb7ff975df647ac30f2ffbd202..2b5cacbfa4b6e88810e52b83039e13b132d0d669 100644
--- a/content/browser/web_contents/web_contents_impl.cc
+++ b/content/browser/web_contents/web_contents_impl.cc
@@ -4498,7 +4498,7 @@ FrameTree* WebContentsImpl::CreateNewWindow(
@@ -4503,7 +4503,7 @@ FrameTree* WebContentsImpl::CreateNewWindow(

// Save the window for later if we're not suppressing the opener (since it
// will be shown immediately).
Expand Down
2 changes: 1 addition & 1 deletion patches/v8/src-codegen-compiler.cc.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
diff --git a/src/codegen/compiler.cc b/src/codegen/compiler.cc
index 03860399e8b393cf315a507dbf5653381fc86d40..5591358cecbcfeceec54d886704f1e05efaaecc3 100644
index ff7360c10148657848440446e8d86bc4fcd51298..1acbf74b7d394670385e4df3dea0f02e6d7127bf 100644
--- a/src/codegen/compiler.cc
+++ b/src/codegen/compiler.cc
@@ -2989,6 +2989,7 @@ MaybeHandle<JSFunction> Compiler::GetFunctionFromEval(
Expand Down