Browse Source

chore: bump chromium to 116.0.5845.228 (26-x-y) (#40043)

* chore: bump chromium in DEPS to 116.0.5845.228

* chore: update patches

* chore: remove libvpx from config

---------

Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com>
Co-authored-by: PatchUp <73610968+patchup[bot]@users.noreply.github.com>
Co-authored-by: Shelley Vohr <[email protected]>
electron-roller[bot] 1 year ago
parent
commit
d5020a4fff

+ 1 - 1
DEPS

@@ -2,7 +2,7 @@ gclient_gn_args_from = 'src'
 
 vars = {
   'chromium_version':
-    '116.0.5845.190',
+    '116.0.5845.228',
   'node_version':
     'v18.16.1',
   'nan_version':

+ 1 - 3
patches/config.json

@@ -21,7 +21,5 @@
 
   "src/electron/patches/ReactiveObjC": "src/third_party/squirrel.mac/vendor/ReactiveObjC",
 
-  "src/electron/patches/webrtc": "src/third_party/webrtc",
-
-  "src/electron/patches/libvpx": "src/third_party/libvpx/source/libvpx"
+  "src/electron/patches/webrtc": "src/third_party/webrtc"
 }

+ 0 - 1
patches/libvpx/.patches

@@ -1 +0,0 @@
-cherry-pick-3fbd1dca6a4d.patch

+ 0 - 27
patches/libvpx/cherry-pick-3fbd1dca6a4d.patch

@@ -1,27 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: James Zern <[email protected]>
-Date: Mon, 25 Sep 2023 18:55:59 -0700
-Subject: VP8: disallow thread count changes
-
-Currently allocations are done at encoder creation time. Going from
-threaded to non-threaded would cause a crash.
-
-Bug: chromium:1486441
-Change-Id: Ie301c2a70847dff2f0daae408fbef1e4d42e73d4
-
-diff --git a/vp8/encoder/onyx_if.c b/vp8/encoder/onyx_if.c
-index c65afc643bf681219343bf25a71f326a9ff33738..c5e9970c3cc8c8bd7b91246f413372d7254ef713 100644
---- a/vp8/encoder/onyx_if.c
-+++ b/vp8/encoder/onyx_if.c
-@@ -1447,6 +1447,11 @@ void vp8_change_config(VP8_COMP *cpi, VP8_CONFIG *oxcf) {
-   last_h = cpi->oxcf.Height;
-   prev_number_of_layers = cpi->oxcf.number_of_layers;
- 
-+  if (cpi->initial_width) {
-+    // TODO(https://crbug.com/1486441): Allow changing thread counts; the
-+    // allocation is done once in vp8_create_compressor().
-+    oxcf->multi_threaded = cpi->oxcf.multi_threaded;
-+  }
-   cpi->oxcf = *oxcf;
- 
-   switch (cpi->oxcf.Mode) {

+ 0 - 1
patches/v8/.patches

@@ -3,4 +3,3 @@ do_not_export_private_v8_symbols_on_windows.patch
 fix_build_deprecated_attribute_for_older_msvc_versions.patch
 fix_disable_implies_dcheck_for_node_stream_array_buffers.patch
 chore_allow_customizing_microtask_policy_per_context.patch
-cherry-pick-cf1d4d3c0b6e.patch

+ 0 - 99
patches/v8/cherry-pick-cf1d4d3c0b6e.patch

@@ -1,99 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Shu-yu Guo <[email protected]>
-Date: Thu, 31 Aug 2023 08:59:12 -0700
-Subject: Merged: [interpreter] Fix TDZ elision in do-while tests
-
-(cherry picked from commit 1626e229a8965f975db6e9da0e7ab85f8c74333f)
-
-Change-Id: Ifb7461b6cfd62a10936470a760cb505cc5e1c60f
-Fixed: chromium:1477588
-Bug: v8:13723
-Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/4862981
-Auto-Submit: Shu-yu Guo <[email protected]>
-Commit-Queue: Shu-yu Guo <[email protected]>
-Reviewed-by: Adam Klein <[email protected]>
-Cr-Commit-Position: refs/branch-heads/11.6@{#38}
-Cr-Branched-From: e29c028f391389a7a60ee37097e3ca9e396d6fa4-refs/heads/11.6.189@{#3}
-Cr-Branched-From: 95cbef20e2aa556a1ea75431a48b36c4de6b9934-refs/heads/main@{#88340}
-
-diff --git a/src/interpreter/bytecode-generator.cc b/src/interpreter/bytecode-generator.cc
-index bd6c01047f9656c96f4fdc5fe6173d774219098d..751411a809c01329d59b3d310292ab0a997842cc 100644
---- a/src/interpreter/bytecode-generator.cc
-+++ b/src/interpreter/bytecode-generator.cc
-@@ -2435,8 +2435,16 @@ void BytecodeGenerator::VisitDoWhileStatement(DoWhileStatement* stmt) {
-     VisitIterationBodyInHoleCheckElisionScope(stmt, &loop_builder);
-     builder()->SetExpressionAsStatementPosition(stmt->cond());
-     BytecodeLabels loop_backbranch(zone());
--    VisitForTest(stmt->cond(), &loop_backbranch, loop_builder.break_labels(),
--                 TestFallthrough::kThen);
-+    if (!loop_builder.break_labels()->empty()) {
-+      // The test may be conditionally executed if there was a break statement
-+      // inside the loop body, and therefore requires its own elision scope.
-+      HoleCheckElisionScope elider(this);
-+      VisitForTest(stmt->cond(), &loop_backbranch, loop_builder.break_labels(),
-+                   TestFallthrough::kThen);
-+    } else {
-+      VisitForTest(stmt->cond(), &loop_backbranch, loop_builder.break_labels(),
-+                   TestFallthrough::kThen);
-+    }
-     loop_backbranch.Bind(builder());
-   }
- }
-diff --git a/test/unittests/interpreter/bytecode-generator-unittest.cc b/test/unittests/interpreter/bytecode-generator-unittest.cc
-index add6f7711f564bbee177b8640d13db730723af6f..c6cd6d87ad9ab81278fda33c4d887bfc7865daa1 100644
---- a/test/unittests/interpreter/bytecode-generator-unittest.cc
-+++ b/test/unittests/interpreter/bytecode-generator-unittest.cc
-@@ -3231,6 +3231,10 @@ TEST_F(BytecodeGeneratorTest, ElideRedundantHoleChecks) {
-     "do { x; } while (y);\n"
-     "x; y;\n",
- 
-+    // do-while with break
-+    "do { x; break; } while (y);\n"
-+    "x; y;\n",
-+
-     // C-style for
-     "for (x; y; z) { w; }\n"
-     "x; y; z; w;\n",
-diff --git a/test/unittests/interpreter/bytecode_expectations/ElideRedundantHoleChecks.golden b/test/unittests/interpreter/bytecode_expectations/ElideRedundantHoleChecks.golden
-index 21819d9247e810b1ca77a3d368c7f7af3a3a3a18..eaca674347108d365d37b26120334fb50debb46b 100644
---- a/test/unittests/interpreter/bytecode_expectations/ElideRedundantHoleChecks.golden
-+++ b/test/unittests/interpreter/bytecode_expectations/ElideRedundantHoleChecks.golden
-@@ -176,6 +176,38 @@ constant pool: [
- handlers: [
- ]
- 
-+---
-+snippet: "
-+  {
-+    f = function f(a) {
-+  do { x; break; } while (y);
-+  x; y;
-+    }
-+    let w, x, y, z;
-+    f();
-+  }
-+"
-+frame size: 0
-+parameter count: 2
-+bytecode array length: 16
-+bytecodes: [
-+  /*   29 S> */ B(LdaImmutableCurrentContextSlot), U8(2),
-+                B(ThrowReferenceErrorIfHole), U8(0),
-+  /*   32 S> */ B(Jump), U8(2),
-+  /*   52 S> */ B(LdaImmutableCurrentContextSlot), U8(2),
-+                B(ThrowReferenceErrorIfHole), U8(0),
-+  /*   55 S> */ B(LdaImmutableCurrentContextSlot), U8(3),
-+                B(ThrowReferenceErrorIfHole), U8(1),
-+                B(LdaUndefined),
-+  /*   60 S> */ B(Return),
-+]
-+constant pool: [
-+  ONE_BYTE_INTERNALIZED_STRING_TYPE ["x"],
-+  ONE_BYTE_INTERNALIZED_STRING_TYPE ["y"],
-+]
-+handlers: [
-+]
-+
- ---
- snippet: "
-   {