chore: update patches

electron · Jan 8, 2024 · d6368a0 · d6368a0
1 parent 1fbbec1
commit d6368a0
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 25 deletions.
diff --git a/patches/angle/m120_vulkan_don_t_crash_when_glcopyteximage2d_redefines_itself.patch b/patches/angle/m120_vulkan_don_t_crash_when_glcopyteximage2d_redefines_itself.patch
@@ -60,7 +60,7 @@ index da27d3cfb0932408f14cd2fd6df88294f4b07363..885982b95e70f0c49f89b565fa0f3331
              {
                  releaseImage(contextVk);
 diff --git a/src/tests/angle_end2end_tests_expectations.txt b/src/tests/angle_end2end_tests_expectations.txt
-index cadf4afaed84c10040b87c8936c4a0ebbfd6d514..24f25e5b1effda3f40623a4ec458005466c5e6a8 100644
+index cfa70eef00a1e8d67f9fbf07ee74928b55da8b92..8b4dac5beab0b8d884116147ba3e61f6133e92a9 100644
 --- a/src/tests/angle_end2end_tests_expectations.txt
 +++ b/src/tests/angle_end2end_tests_expectations.txt
 @@ -29,6 +29,8 @@

diff --git a/patches/chromium/cherry-pick-50a1bddfca85.patch b/patches/chromium/cherry-pick-50a1bddfca85.patch
@@ -1,7 +1,8 @@
-From 50a1bddfca85046282797f0361c35c92f9eacf6a Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Austin Eng <enga@chromium.org>
 Date: Tue, 19 Dec 2023 17:25:51 +0000
-Subject: [PATCH] Use cross thread handles to bind args for async webgpu context creation
+Subject: Use cross thread handles to bind args for async webgpu context
+ creation
 
 (cherry picked from commit 542b278a0c1de7202f4bf5e3e5cbdc2dd6c337d4)
 
@@ -15,10 +16,9 @@ Cr-Original-Commit-Position: refs/heads/main@{#1237179}
 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5133239
 Cr-Commit-Position: refs/branch-heads/6099@{#1551}
 Cr-Branched-From: e6ee4500f7d6549a9ac1354f8d056da49ef406be-refs/heads/main@{#1217362}
----
 
 diff --git a/third_party/blink/renderer/modules/webgpu/gpu.cc b/third_party/blink/renderer/modules/webgpu/gpu.cc
-index 3067c9a..92c0428f 100644
+index dbe8ab27798ca1a9aa80f34cbfc88f52adfe3b84..9627347a3b495dffa20f3aa0cfbcaa524eced686 100644
 --- a/third_party/blink/renderer/modules/webgpu/gpu.cc
 +++ b/third_party/blink/renderer/modules/webgpu/gpu.cc
 @@ -39,11 +39,13 @@
@@ -35,7 +35,7 @@ index 3067c9a..92c0428f 100644
 
  namespace blink {
 
-@@ -300,9 +302,19 @@
+@@ -300,9 +302,19 @@ void GPU::RequestAdapterImpl(ScriptState* script_state,
      CreateWebGPUGraphicsContext3DProviderAsync(
          execution_context->Url(),
          execution_context->GetTaskRunner(TaskType::kWebGPU),
@@ -57,7 +57,7 @@ index 3067c9a..92c0428f 100644
                const KURL& url = execution_context->Url();
                context_provider =
                    CheckContextProvider(url, std::move(context_provider));
-@@ -324,7 +336,8 @@
+@@ -324,7 +336,8 @@ void GPU::RequestAdapterImpl(ScriptState* script_state,
                  std::move(callback).Run();
                }
              },
@@ -68,10 +68,10 @@ index 3067c9a..92c0428f 100644
    }
 
 diff --git a/third_party/blink/renderer/platform/graphics/web_graphics_context_3d_provider_util.cc b/third_party/blink/renderer/platform/graphics/web_graphics_context_3d_provider_util.cc
-index e981c2d..29569d4 100644
+index f859f3e62c54d26453a145321f697c5116c13348..3d9890b9b4a58a30a11e501fdb9297f4a57b601b 100644
 --- a/third_party/blink/renderer/platform/graphics/web_graphics_context_3d_provider_util.cc
 +++ b/third_party/blink/renderer/platform/graphics/web_graphics_context_3d_provider_util.cc
-@@ -122,8 +122,8 @@
+@@ -121,8 +121,8 @@ CreateWebGPUGraphicsContext3DProvider(const KURL& url) {
  void CreateWebGPUGraphicsContext3DProviderAsync(
      const KURL& url,
      scoped_refptr<base::SingleThreadTaskRunner> current_thread_task_runner,
@@ -82,7 +82,7 @@ index e981c2d..29569d4 100644
    if (IsMainThread()) {
      std::move(callback).Run(
          Platform::Current()->CreateWebGPUGraphicsContext3DProvider(url));
-@@ -141,8 +141,7 @@
+@@ -140,8 +140,7 @@ void CreateWebGPUGraphicsContext3DProviderAsync(
              AccessMainThreadForWebGraphicsContext3DProvider()),
          FROM_HERE,
          CrossThreadBindOnce(&CreateWebGPUGraphicsContextOnMainThreadAsync, url,
@@ -93,7 +93,7 @@ index e981c2d..29569d4 100644
  }
 
 diff --git a/third_party/blink/renderer/platform/graphics/web_graphics_context_3d_provider_util.h b/third_party/blink/renderer/platform/graphics/web_graphics_context_3d_provider_util.h
-index 8fcab24b..8b785cc3 100644
+index 8fcab24bfec2c9b2e9edf9885b66de4f99949b35..8b785cc30acdfffed0f59eb53b073d0cdedc2151 100644
 --- a/third_party/blink/renderer/platform/graphics/web_graphics_context_3d_provider_util.h
 +++ b/third_party/blink/renderer/platform/graphics/web_graphics_context_3d_provider_util.h
 @@ -10,6 +10,7 @@
@@ -104,7 +104,7 @@ index 8fcab24b..8b785cc3 100644
 
  namespace blink {
 
-@@ -42,8 +43,8 @@
+@@ -42,8 +43,8 @@ CreateWebGPUGraphicsContext3DProvider(const KURL& url);
  PLATFORM_EXPORT void CreateWebGPUGraphicsContext3DProviderAsync(
      const KURL& url,
      scoped_refptr<base::SingleThreadTaskRunner> current_thread_task_runner,

diff --git a/patches/chromium/cherry-pick-5b2fddadaa12.patch b/patches/chromium/cherry-pick-5b2fddadaa12.patch
@@ -1,7 +1,7 @@
-From 5b2fddadaa12e4f4aa8166de13446db5e339c4fa Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Hongchan Choi <hongchan@chromium.org>
 Date: Tue, 12 Dec 2023 02:34:29 +0000
-Subject: [PATCH] Clamp the input value correctly before scheduling an AudioParam event
+Subject: Clamp the input value correctly before scheduling an AudioParam event
 
 When the AudioParam value is set via the setter, it internally calls
 the setValueAtTime() function to schedule the change. However, the
@@ -23,13 +23,12 @@ Bot-Commit: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com>
 Auto-Submit: Hongchan Choi <hongchan@chromium.org>
 Cr-Commit-Position: refs/branch-heads/6099@{#1497}
 Cr-Branched-From: e6ee4500f7d6549a9ac1354f8d056da49ef406be-refs/heads/main@{#1217362}
----
 
 diff --git a/third_party/blink/renderer/modules/webaudio/audio_param.cc b/third_party/blink/renderer/modules/webaudio/audio_param.cc
-index 8c7b9d0..95a40d3 100644
+index 8c7b9d07bb68ec51d21ea2132cc5ecbc39e5cd95..95a40d39c9214fd6555523bd7e7bd91e36d2c6c0 100644
 --- a/third_party/blink/renderer/modules/webaudio/audio_param.cc
 +++ b/third_party/blink/renderer/modules/webaudio/audio_param.cc
-@@ -120,12 +120,15 @@
+@@ -120,12 +120,15 @@ void AudioParam::setValue(float value) {
  void AudioParam::setValue(float value, ExceptionState& exception_state) {
    WarnIfOutsideRange("value", value);
 
@@ -51,7 +50,7 @@ index 8c7b9d0..95a40d3 100644
 
  float AudioParam::defaultValue() const {
 diff --git a/third_party/blink/web_tests/webaudio/AudioParam/worklet-warnings-expected.txt b/third_party/blink/web_tests/webaudio/AudioParam/worklet-warnings-expected.txt
-index 86586c24..c88dd11 100644
+index 7bb2d0aec7feaed69424f209a2e3e031c7a9e512..ebe05a2c239d35be4729cc187aa77de6a44f5a41 100644
 --- a/third_party/blink/web_tests/webaudio/AudioParam/worklet-warnings-expected.txt
 +++ b/third_party/blink/web_tests/webaudio/AudioParam/worklet-warnings-expected.txt
 @@ -1,5 +1,4 @@

diff --git a/patches/sqlite/fix_a_spurious_misuse_of_aggregate_function_error_that_could_occur.patch b/patches/sqlite/fix_a_spurious_misuse_of_aggregate_function_error_that_could_occur.patch
@@ -244,7 +244,7 @@ index 2c893770b04e06932b9c4405ff9b41a13aff68d0..ab94b56c638724a9de8ea2da49c944fb
  };
 
 diff --git a/test/aggnested.test b/test/aggnested.test
-index 1b8b608803912d5d8b7a7562dd31ec4a46627da4..4e74d75f35c78742327b3491902a295651846b63 100644
+index 1b8b608803912d5d8b7a7562dd31ec4a46627da4..6599fbf90940e49ce3467c67b7c8800aa90b17c0 100644
 --- a/test/aggnested.test
 +++ b/test/aggnested.test
 @@ -358,6 +358,60 @@ do_execsql_test 6.2.2 {

diff --git a/patches/sqlite/utf-8_q_in_20the_20count-of-view_20optimization_20deferring_20.patch b/patches/sqlite/utf-8_q_in_20the_20count-of-view_20optimization_20deferring_20.patch
@@ -1,10 +1,9 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: drh <>
 Date: Fri, 15 Dec 2023 20:13:09 +0000
-Subject: =?UTF-8?q?In=20the=20count-of-view=20optimization,=20deferring=20?=
- =?UTF-8?q?freeing=20obsolete=20parts=20of=20the=0Aparse=20tree,=20on=20th?=
- =?UTF-8?q?e=20off-chance=20that=20some=20other=20part=20of=20the=20code?=
- =?UTF-8?q?=20might=20be=0Aholding=20a=20pointer=20to=20those=20parts.?=
+Subject: In the count-of-view optimization, deferring freeing obsolete parts
+ of the parse tree, on the off-chance that some other part of the code might
+ be holding a pointer to those parts.
 
 FossilOrigin-Name: da442578856c87137eb1677d9b13b7c1cf15828cc41d4756572b278060f69bae
 (cherry picked from commit 40e614e393268a6684d07b1a57ae9bb935d65b5a)

diff --git a/patches/v8/turboshaft_fix_structuraloptimization_because_of_ignored.patch b/patches/v8/turboshaft_fix_structuraloptimization_because_of_ignored.patch
@@ -1,8 +1,7 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Pedro Pontes <pepontes@microsoft.com>
 Date: Fri, 5 Jan 2024 05:04:35 -0800
-Subject: [turboshaft] Fix StructuralOptimization because of ignored
- side-effects
+Subject: Fix StructuralOptimization because of ignored side-effects
 
 Side-effects in the 1st else block were not taken into account.