Skip to content

Commit

Permalink
chore: bump chromium to 129.0.6636.0 (main) (electron#43194)
Browse files Browse the repository at this point in the history
* chore: bump chromium in DEPS to 129.0.6636.0

* chore: e patches all

to make GH actions happy

---------

Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com>
Co-authored-by: Charles Kerr <[email protected]>
  • Loading branch information
electron-roller[bot] and ckerr authored Aug 4, 2024
1 parent 20e77af commit f508f6b
Show file tree
Hide file tree
Showing 6 changed files with 11 additions and 11 deletions.
2 changes: 1 addition & 1 deletion DEPS
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ gclient_gn_args_from = 'src'

vars = {
'chromium_version':
'129.0.6634.0',
'129.0.6636.0',
'node_version':
'v20.16.0',
'nan_version':
Expand Down
2 changes: 1 addition & 1 deletion patches/chromium/blink_local_frame.patch
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ index 313b9756ba3b28c26baa408088fe9cec9bcfa283..96e8579d1be764bb4aac9ef82e6ede19
// its owning reference back to our owning LocalFrame.
client_->Detached(type);
diff --git a/third_party/blink/renderer/core/frame/local_frame.cc b/third_party/blink/renderer/core/frame/local_frame.cc
index 496493cb923583164a73364ed1ac0a57a4fad6b2..4357c005f9b731566451b31d133d441f084a1c86 100644
index fb41c4b4e2cb3ae49475121317b2ce1e5f803601..337fac133deea60fe01ef0210cb9543a5d0ed116 100644
--- a/third_party/blink/renderer/core/frame/local_frame.cc
+++ b/third_party/blink/renderer/core/frame/local_frame.cc
@@ -733,10 +733,6 @@ bool LocalFrame::DetachImpl(FrameDetachType type) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,10 +33,10 @@ index 74c16760fbd0ec88d8cd4e92a6fc9a68c0a3ebe3..f4907e0e2f491078a652baba8302181f
"//base",
"//build:branding_buildflags",
diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
index 2f388bff7d1ddc31a3600c2037f115c424232bc3..ca612855d7fcada2c39cfedbc49e706d098537ae 100644
index 5240d913975e90c9fc78304a6fa3fb2ac58b57ba..900bba5ae8cfaeaee4d978507dff378d28e5c1fa 100644
--- a/chrome/browser/BUILD.gn
+++ b/chrome/browser/BUILD.gn
@@ -4573,7 +4573,7 @@ static_library("browser") {
@@ -4551,7 +4551,7 @@ static_library("browser") {
]
}

Expand All @@ -46,7 +46,7 @@ index 2f388bff7d1ddc31a3600c2037f115c424232bc3..ca612855d7fcada2c39cfedbc49e706d
# than here in :chrome_dll.
deps += [ "//chrome:packed_resources_integrity_header" ]
diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn
index f75774f57a6d3b6c8fd44b9cf98c9c1222e018c6..45358e265b3d5efb0bf5ea7babd37fcd39614c71 100644
index 0cc8cfda470bb4c7593724a56e5e455c913a101d..d64f59e46303ce751f7d98159e3dba2ade6772d5 100644
--- a/chrome/test/BUILD.gn
+++ b/chrome/test/BUILD.gn
@@ -7155,9 +7155,12 @@ test("unit_tests") {
Expand All @@ -63,7 +63,7 @@ index f75774f57a6d3b6c8fd44b9cf98c9c1222e018c6..45358e265b3d5efb0bf5ea7babd37fcd
"//chrome//services/util_win:unit_tests",
"//chrome/app:chrome_dll_resources",
"//chrome/app:win_unit_tests",
@@ -8186,6 +8189,10 @@ test("unit_tests") {
@@ -8182,6 +8185,10 @@ test("unit_tests") {
"../browser/performance_manager/policies/background_tab_loading_policy_unittest.cc",
]

Expand All @@ -74,7 +74,7 @@ index f75774f57a6d3b6c8fd44b9cf98c9c1222e018c6..45358e265b3d5efb0bf5ea7babd37fcd
sources += [
# The importer code is not used on Android.
"../common/importer/firefox_importer_utils_unittest.cc",
@@ -8258,7 +8265,6 @@ test("unit_tests") {
@@ -8254,7 +8261,6 @@ test("unit_tests") {

# Non-android deps for "unit_tests" target.
deps += [
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ index 016c33d9fb5673ca1b96a9135f0ca5118d837a12..0115b30344e36ee6f4852028ba992cc8
// origin of |common_params.url| and/or |common_params.initiator_origin|.
url::Origin resolved_origin = url::Origin::Resolve(
diff --git a/third_party/blink/renderer/core/loader/document_loader.cc b/third_party/blink/renderer/core/loader/document_loader.cc
index face65569b840df90b94b1a6c327f6fe0df1cdfa..40ac30321b0efcd5f5a009f8b3eb94f1a6111dd6 100644
index 2c9efc43b52219f8e2875e838819180c4995ee2b..88f13d06cac5e592d60fa9a26c7ccf3c152d722e 100644
--- a/third_party/blink/renderer/core/loader/document_loader.cc
+++ b/third_party/blink/renderer/core/loader/document_loader.cc
@@ -2253,6 +2253,10 @@ Frame* DocumentLoader::CalculateOwnerFrame() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ index cba373664bec3a32abad6fe0396bd67b53b7e67f..7a985067b1371604644d48159f2f5aa7

#endif // THIRD_PARTY_BLINK_PUBLIC_WEB_WEB_SCRIPT_EXECUTION_CALLBACK_H_
diff --git a/third_party/blink/renderer/core/frame/local_frame.cc b/third_party/blink/renderer/core/frame/local_frame.cc
index 4357c005f9b731566451b31d133d441f084a1c86..0ae4ec8b42ad5f82c7d3ad1b9b91e690548daab4 100644
index 337fac133deea60fe01ef0210cb9543a5d0ed116..c6f55e730b6dec0017045eb2ab543d5a2839f1fe 100644
--- a/third_party/blink/renderer/core/frame/local_frame.cc
+++ b/third_party/blink/renderer/core/frame/local_frame.cc
@@ -3110,6 +3110,7 @@ void LocalFrame::RequestExecuteScript(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ system font by checking if it's kCTFontPriorityAttribute is set to
system priority.

diff --git a/base/BUILD.gn b/base/BUILD.gn
index 556c7b5e4f73a9bd3b1d14589e823b6b1bafe8db..570dc5fa4c56bd3392ab2f0d813373ab2ba2d09a 100644
index f23f880efa562ed992eb9dc92946437b2151d1f1..848f860907f118a8f6cea188601e0873397265cd 100644
--- a/base/BUILD.gn
+++ b/base/BUILD.gn
@@ -1050,6 +1050,7 @@ component("base") {
Expand Down Expand Up @@ -629,7 +629,7 @@ index 0738636a7462fd973c12d0e26e298c3b767f0c53..977e90c5dc3d8ff48ba9674c1c7d5eb6
public_deps = [
":mojo_bindings",
diff --git a/content/renderer/BUILD.gn b/content/renderer/BUILD.gn
index aa858c2dd7594798e7b8d1a947fb85b0eb506710..8e9c678f9af71175c842343e3fd19b2c2cce1416 100644
index 6b6d292cf28c25c5ee903b2833eaf797bcbd8706..cedeb95341224e404372f7e54b8c8b026c6fb926 100644
--- a/content/renderer/BUILD.gn
+++ b/content/renderer/BUILD.gn
@@ -232,6 +232,7 @@ target(link_target_type, "renderer") {
Expand Down

0 comments on commit f508f6b

Please sign in to comment.