From d02c8874092f04062d1f1e44c57080c85362053c Mon Sep 17 00:00:00 2001 From: "electron-roller[bot]" <84116207+electron-roller[bot]@users.noreply.github.com> Date: Thu, 22 Aug 2024 19:39:33 -0500 Subject: [PATCH] chore: bump chromium to 128.0.6613.84 (32-x-y) (#43425) * chore: bump chromium in DEPS to 128.0.6613.84 * chore: update patches --------- Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: John Kleinschmidt --- DEPS | 2 +- ...lectron_deps_to_license_credits_file.patch | 2 +- ..._depend_on_packed_resource_integrity.patch | 8 +- ...rofile_methods_in_chrome_browser_pdf.patch | 6 +- patches/v8/.patches | 1 - ...all_loop_inputs_before_entering_loop.patch | 104 ------------------ 6 files changed, 9 insertions(+), 114 deletions(-) delete mode 100644 patches/v8/spill_all_loop_inputs_before_entering_loop.patch diff --git a/DEPS b/DEPS index 4b245a81278e..cecb3a3df726 100644 --- a/DEPS +++ b/DEPS @@ -2,7 +2,7 @@ gclient_gn_args_from = 'src' vars = { 'chromium_version': - '128.0.6613.36', + '128.0.6613.84', 'node_version': 'v20.16.0', 'nan_version': diff --git a/patches/chromium/add_electron_deps_to_license_credits_file.patch b/patches/chromium/add_electron_deps_to_license_credits_file.patch index 70ff5e3e740f..9e8de8ce3f79 100644 --- a/patches/chromium/add_electron_deps_to_license_credits_file.patch +++ b/patches/chromium/add_electron_deps_to_license_credits_file.patch @@ -7,7 +7,7 @@ Ensure that licenses for the dependencies introduced by Electron are included in `LICENSES.chromium.html` diff --git a/tools/licenses/licenses.py b/tools/licenses/licenses.py -index c64e1fadc4474051a6981c83300f64fdbeb64cc0..e3ca127e39a2b69b97941293a13bd41b3cf763d6 100755 +index adaef4ca99997896a4b332459205f58c4f403436..fe8be520bb68729228f79961776a20142329478a 100755 --- a/tools/licenses/licenses.py +++ b/tools/licenses/licenses.py @@ -335,6 +335,31 @@ SPECIAL_CASES = { diff --git a/patches/chromium/build_do_not_depend_on_packed_resource_integrity.patch b/patches/chromium/build_do_not_depend_on_packed_resource_integrity.patch index 571a0a62df59..12bd3b7995fb 100644 --- a/patches/chromium/build_do_not_depend_on_packed_resource_integrity.patch +++ b/patches/chromium/build_do_not_depend_on_packed_resource_integrity.patch @@ -46,10 +46,10 @@ index fe0452e8bd462ba44bf6b019720c7cd9a0143a5f..f0764bc70afc3ffb9f99b7d52c1e4b6b sources += [ "certificate_viewer_stub.cc" ] } diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn -index e48ebb42c3105029f69607effdeac634d8c99745..017c7d498e9d7b08753070dd90af402e4b442dd3 100644 +index 18fad187e0c9c14be10296cdf045dbbc456d7229..3dbc18b142b453989e7794081676e6efef6d09ff 100644 --- a/chrome/test/BUILD.gn +++ b/chrome/test/BUILD.gn -@@ -7203,9 +7203,12 @@ test("unit_tests") { +@@ -7201,9 +7201,12 @@ test("unit_tests") { "//chrome/browser/safe_browsing/incident_reporting/verifier_test:verifier_test_dll_2", ] @@ -63,7 +63,7 @@ index e48ebb42c3105029f69607effdeac634d8c99745..017c7d498e9d7b08753070dd90af402e "//chrome//services/util_win:unit_tests", "//chrome/app:chrome_dll_resources", "//chrome/app:win_unit_tests", -@@ -8228,6 +8231,10 @@ test("unit_tests") { +@@ -8226,6 +8229,10 @@ test("unit_tests") { "../browser/performance_manager/policies/background_tab_loading_policy_unittest.cc", ] @@ -74,7 +74,7 @@ index e48ebb42c3105029f69607effdeac634d8c99745..017c7d498e9d7b08753070dd90af402e sources += [ # The importer code is not used on Android. "../common/importer/firefox_importer_utils_unittest.cc", -@@ -8303,7 +8310,6 @@ test("unit_tests") { +@@ -8301,7 +8308,6 @@ test("unit_tests") { # Non-android deps for "unit_tests" target. deps += [ diff --git a/patches/chromium/chore_patch_out_profile_methods_in_chrome_browser_pdf.patch b/patches/chromium/chore_patch_out_profile_methods_in_chrome_browser_pdf.patch index 1d3d2ccd9528..1cc7d0cd50e1 100644 --- a/patches/chromium/chore_patch_out_profile_methods_in_chrome_browser_pdf.patch +++ b/patches/chromium/chore_patch_out_profile_methods_in_chrome_browser_pdf.patch @@ -9,10 +9,10 @@ Electron does not support Profiles, so this Profile::FromBrowserContext() call is not needed and will not link. This change patches it out. diff --git a/chrome/browser/pdf/chrome_pdf_stream_delegate.cc b/chrome/browser/pdf/chrome_pdf_stream_delegate.cc -index 33702623b417dc11dec22eeb7e810a77506e5f3b..da734688f46b3ac97e93a44b20b06710b749968b 100644 +index 95f7376482c19cf5bb4ec898cc1f6aa6784ce60c..a5722a28a99ea401d7ed83a76f612ea17552ca7a 100644 --- a/chrome/browser/pdf/chrome_pdf_stream_delegate.cc +++ b/chrome/browser/pdf/chrome_pdf_stream_delegate.cc -@@ -44,6 +44,7 @@ namespace { +@@ -45,6 +45,7 @@ namespace { // hierarchy is: enterprise policy > user choice > finch experiment. bool ShouldEnableSkiaRenderer(content::WebContents* contents) { CHECK(contents); @@ -20,7 +20,7 @@ index 33702623b417dc11dec22eeb7e810a77506e5f3b..da734688f46b3ac97e93a44b20b06710 const PrefService* prefs = Profile::FromBrowserContext(contents->GetBrowserContext())->GetPrefs(); -@@ -51,6 +52,7 @@ bool ShouldEnableSkiaRenderer(content::WebContents* contents) { +@@ -52,6 +53,7 @@ bool ShouldEnableSkiaRenderer(content::WebContents* contents) { if (prefs->IsManagedPreference(prefs::kPdfUseSkiaRendererEnabled)) { return prefs->GetBoolean(prefs::kPdfUseSkiaRendererEnabled); } diff --git a/patches/v8/.patches b/patches/v8/.patches index 7ab46bcb8222..886a2ec1a311 100644 --- a/patches/v8/.patches +++ b/patches/v8/.patches @@ -1,4 +1,3 @@ chore_allow_customizing_microtask_policy_per_context.patch deps_add_v8_object_setinternalfieldfornodecore.patch fix_disable_scope_reuse_associated_dchecks.patch -spill_all_loop_inputs_before_entering_loop.patch diff --git a/patches/v8/spill_all_loop_inputs_before_entering_loop.patch b/patches/v8/spill_all_loop_inputs_before_entering_loop.patch deleted file mode 100644 index 0aa2a82cea80..000000000000 --- a/patches/v8/spill_all_loop_inputs_before_entering_loop.patch +++ /dev/null @@ -1,104 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Clemens Backes -Date: Tue, 20 Aug 2024 12:25:40 +0200 -Subject: Spill all loop inputs before entering loop - -This avoids having to load the value back into a register if it was -spilled inside of the loop. - -R=jkummerow@chromium.org - -Fixed: chromium:360700873 -Change-Id: I24f5deacebc893293e8a3c007e9f070c7fa0ccd2 -Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/5797073 -Reviewed-by: Jakob Kummerow -Commit-Queue: Clemens Backes -Cr-Commit-Position: refs/heads/main@{#95711} - -diff --git a/src/wasm/baseline/liftoff-assembler.cc b/src/wasm/baseline/liftoff-assembler.cc -index bee21dfbaaaf45b831b7ee4e70ecf13369c116b7..52e9cfe7c562479ef5310840978cb5d973a09117 100644 ---- a/src/wasm/baseline/liftoff-assembler.cc -+++ b/src/wasm/baseline/liftoff-assembler.cc -@@ -424,29 +424,10 @@ void LiftoffAssembler::DropExceptionValueAtOffset(int offset) { - cache_state_.stack_state.pop_back(); - } - --void LiftoffAssembler::PrepareLoopArgs(int num) { -- for (int i = 0; i < num; ++i) { -- VarState& slot = cache_state_.stack_state.end()[-1 - i]; -- if (slot.is_stack()) continue; -- RegClass rc = reg_class_for(slot.kind()); -- if (slot.is_reg()) { -- if (cache_state_.get_use_count(slot.reg()) > 1) { -- // If the register is used more than once, we cannot use it for the -- // merge. Move it to an unused register instead. -- LiftoffRegList pinned; -- pinned.set(slot.reg()); -- LiftoffRegister dst_reg = GetUnusedRegister(rc, pinned); -- Move(dst_reg, slot.reg(), slot.kind()); -- cache_state_.dec_used(slot.reg()); -- cache_state_.inc_used(dst_reg); -- slot.MakeRegister(dst_reg); -- } -- continue; -- } -- LiftoffRegister reg = GetUnusedRegister(rc, {}); -- LoadConstant(reg, slot.constant()); -- slot.MakeRegister(reg); -- cache_state_.inc_used(reg); -+void LiftoffAssembler::SpillLoopArgs(int num) { -+ for (VarState& slot : -+ base::VectorOf(cache_state_.stack_state.end() - num, num)) { -+ Spill(&slot); - } - } - -@@ -664,14 +645,14 @@ void LiftoffAssembler::Spill(VarState* slot) { - } - - void LiftoffAssembler::SpillLocals() { -- for (uint32_t i = 0; i < num_locals_; ++i) { -- Spill(&cache_state_.stack_state[i]); -+ for (VarState& local_slot : -+ base::VectorOf(cache_state_.stack_state.data(), num_locals_)) { -+ Spill(&local_slot); - } - } - - void LiftoffAssembler::SpillAllRegisters() { -- for (uint32_t i = 0, e = cache_state_.stack_height(); i < e; ++i) { -- auto& slot = cache_state_.stack_state[i]; -+ for (VarState& slot : cache_state_.stack_state) { - if (!slot.is_reg()) continue; - Spill(slot.offset(), slot.reg(), slot.kind()); - slot.MakeStack(); -diff --git a/src/wasm/baseline/liftoff-assembler.h b/src/wasm/baseline/liftoff-assembler.h -index 54da02b77918fad52da35d272d16bd699a417133..9b109846b501164250b3e2157bf9afaa93f403ac 100644 ---- a/src/wasm/baseline/liftoff-assembler.h -+++ b/src/wasm/baseline/liftoff-assembler.h -@@ -477,9 +477,9 @@ class LiftoffAssembler : public MacroAssembler { - // the bottom of the stack. - void DropExceptionValueAtOffset(int offset); - -- // Ensure that the loop inputs are either in a register or spilled to the -- // stack, so that we can merge different values on the back-edge. -- void PrepareLoopArgs(int num); -+ // Spill all loop inputs to the stack to free registers and to ensure that we -+ // can merge different values on the back-edge. -+ void SpillLoopArgs(int num); - - V8_INLINE static int NextSpillOffset(ValueKind kind, int top_spill_offset); - V8_INLINE int NextSpillOffset(ValueKind kind); -diff --git a/src/wasm/baseline/liftoff-compiler.cc b/src/wasm/baseline/liftoff-compiler.cc -index 87ddcef9b08616ceec56128cf9f4ec248f069490..250426abf8de4649a71779cdf6d2a572fc595e38 100644 ---- a/src/wasm/baseline/liftoff-compiler.cc -+++ b/src/wasm/baseline/liftoff-compiler.cc -@@ -1392,7 +1392,7 @@ class LiftoffCompiler { - // pre-analysis of the function. - __ SpillLocals(); - -- __ PrepareLoopArgs(loop->start_merge.arity); -+ __ SpillLoopArgs(loop->start_merge.arity); - - // Loop labels bind at the beginning of the block. - __ bind(loop->label.get());