chore: bump chromium to 126.0.6478.36 (31-x-y) (#42167)

* chore: bump chromium in DEPS to 126.0.6468.2 * chore: bump chromium in DEPS to 126.0.6478.4 * chore: bump chromium in DEPS to 126.0.6478.9 * chore: bump chromium in DEPS to 126.0.6478.8 * 5492605: Migrate TODOs referencing old crbug IDs to the new issue tracker IDs | 5492605 (cherry picked from commit 01bbc6b9609954e6f5e8ed2d7c5864e6f2a7929b) * 5513277: Move subresource-filter-ruleset to GCS | 5513277 (cherry picked from commit 284bbbdf86d640cfbe27831524a7cefa1f0ec344) * 5512656: Remove CustomizeChromeSupportsChromeRefresh2023 | 5512656 (cherry picked from commit 41acddd97e2f4f79dba13a3916c1af46d47fa6f5) * 5516009: Accept mouse events in inactive window for Top Chrome WebUIs | 5516009 (cherry picked from commit ffc88b3b2a7bee830a1e78b64afb6dfe6aff7347) * 5376861: Change references to RWHVB in RWHIER and RenderWidgetTargeter to RWHVI. | 5376861 (cherry picked from commit 5a48cf6952f0c3fde8a4d2b717ac5b2d50d13671) * 5490530: Use partition_alloc PA_BUILDFLAG(...) outside PA. #cleanup | 5490530 (cherry picked from commit 8deba32e729d3ded310be6645a27a78458046d69) * 5296870: network: Allow trusted loaders to learn the sent request cookies. | 5296870 (cherry picked from commit 7aef2f0ad890bb778fa8843bd262daf6909c5f52) * 5453438: Delegate delegated ink trails to RWHI from RWHIER. | 5453438 (cherry picked from commit 368eb3924a3b9b58430c7340b930254a3db6f1a3) * chore: update patches (cherry picked from commit 9d6dac074b0f173e43d8e587edbe7de1565de3d6) * chore: update patches (cherry picked from commit fb4134d68204ea85a095d496b31216905f801878) * update patches (cherry picked from commit 6f6fff5b0b08c4cccdbc98950f8cbb399caf6340) * only disable enterprise_cloud_content_analysis (cherry picked from commit 5426d227ee5f4ce60ed3f1c863fe506ee706e78b) * 5403888: [api] support v8::Data in v8::TracedReference and v8::EmbedderGraph 5403888 (cherry picked from commit 2030447cf5bbce26b73e2e9b054dee38438f9fdd) * chore: update patches * chore: fixup patch * 5465511: [api] Mark v8::ObjectTemplate::SetAccessor(..) for deprecation 5465511 * 5513528: Move service_provider_config files to components/enterprise/connectors/ 5513528 * chore: bump chromium in DEPS to 126.0.6478.17 * chore: bump chromium in DEPS to 126.0.6478.26 * chore: update patches * build: use Sha256Sum in script/sysroots.json Xref: 5506275 (cherry picked from commit fccef2b6ba8769da9d8b1bd81fda5cc61b2086e0) * fixup! build: use Sha256Sum in script/sysroots.json `sync` succeeds now (cherry picked from commit e71852729fbf3575d1bc37774deadddfebdeefb4) * chore: cherry-pick Node.js patch for V8 API removal fix Node.js PR: https://github.com/nodejs/node/pull/52996 V8 API Removal CL: 5539888 See the patch description for more details. (cherry picked from commit ef0c441dbaa97478828ad481a39d0c2c93748729) * chore: revert v8 deprecation See patch message for more details. 5526611 (cherry picked from commit 6f03785eadea8d8629970c24393f0900fc3fa4af) * chore: revert v8 removal 5497515 See patch message for more details. (cherry picked from commit 4fd7f5bbb603b0461482fee027de7bfdbf02ceac) * 5522321: [devtools] Support saving base64 encoded files via host bindings 5522321 (cherry picked from commit 4b5f43d7838062834de6d634033fe10af2f9d01a) * fixup! 5465511: [api] Mark v8::ObjectTemplate::SetAccessor(..) for deprecation 5465511 (cherry picked from commit 368005f2b2f9195bcffb5325041e3ff1041a3830) * 5514687: Reland "Add a secret handshake to the base::Feature constructor" 5514687 (cherry picked from commit 142c6e16b10496b3fffddc9924001fb94096852e) * 5512176: Remove OnEnvironmentEstimationComplete() 5512176 (cherry picked from commit 1e20ffb24ef6d0b0aeec8c314393cb77631ab279) * 5539888: [api] Remove several APIs deprecated in version 12.6 5539888 This commit essentially only removes the `only_terminate_in_safe_scope` isolate creation parameter. This undoes some work that was originally done in #35766. (cherry picked from commit ceb6182b199e2471c64700203bf42b73052a38c6) * 5492183: Extensions: CodeHealth: Give enums some class 5492183 (cherry picked from commit a11b8e637cdc0868b6152dd5b0ed3b582f446aa7) * 5483406: [PEPC] Make PEPC permission subscription take into account device status 5483406 (cherry picked from commit fc93c876b481a988a6c1d5eb69d97035dc5ad64a) * 5463431: iwa: Only create IsolatedWebAppURLLoaderFactory for subresources in IWAs 5463431 (cherry picked from commit fbfe3c998c8251f28b76c2703a3212b5b0175a84) * 5502081: Migrate OnDisplayRemoved to OnDisplaysRemoved 5502081 (cherry picked from commit ccf9a5137efdf2ca18d9ee9851388338c26d036e) * 5376861: Change references to RWHVB in RWHIER and RenderWidgetTargeter to RWHVI. 5376861 (cherry picked from commit fd3e6ce148b3c5ab27e234d28b9405933ba32b14) * fixup! 5530163: [media] Use VideoFrame::Plane typed enum instead of nameless enum 5530163 (cherry picked from commit 9a900e734a8c08e534317ca4d7411bfadd9087f5) * 5530163: [media] Use VideoFrame::Plane typed enum instead of nameless enum 5530163 (cherry picked from commit fd94de9736125c3121aed99f50f2702fc430ba26) * 5466238: PDF Viewer: add metrics to record if PDF is opened with a11y 5466238 (cherry picked from commit 2abb5d1737083241b6b6a4c05d5982693e956a22) * 5513740: Reland "[Extensions] Restructure extensions::ProcessMap" 5513740 (cherry picked from commit 11905a9840f1e8dce21cfdda1a23f328e8ff6a6a) * 5498236: Make browser_tests force full async initialization for OSCrypt Async 5498236 (cherry picked from commit e00faacb58545c37cfbf8a38a0cbe4ccb9f9df06) * fixup: only disable enterprise_cloud_content_analysis The original commit a5480accc2, was due to this CL 5527572: Move Connectors prefs files to components/enterprise/connectors/ | 5527572 (cherry picked from commit b0e2a7eab6c0decf982f913a892d5dfdb2501084) * chore: update patches * fixup: 5539888: [api] Remove several APIs deprecated in version 12.6 (cherry picked from commit ae65fea668baad44cac7073cbe0a64bca36bccac) * views: use CalculatePreferredSize(SizeBounds) in '/chrome/browser/ui/views/[frame, infobars, /test]'. 5493169 Needed because of 5504212: views: remove CalculatePreferredSize() | 5504212 * fixup: views: use CalculatePreferredSize(SizeBounds) * 5499157: Enable kBlockMidiByDefault by default 5499157 * 5518756: Reland^2: [heap] Add shared trusted spaces | 5518756 ececfe7aea * chore: bump chromium in DEPS to 126.0.6478.36 * chore: update patches * chore: add currently-unused should_include_device_status arg to GetPermissionStatusForCurrentDocument() Xref: 5545382 (cherry picked from commit bc35c93efd2d3301e33116d2dd09abaf8eddbf70) --------- Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: Keeley Hammond <khammond@slack-corp.com> Co-authored-by: VerteDinde <vertedinde@electronjs.org> Co-authored-by: Jeremy Rose <nornagon@nornagon.net> Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org> Co-authored-by: Charles Kerr <charles@charleskerr.com> Co-authored-by: clavin <clavin@electronjs.org> Co-authored-by: PatchUp <73610968+patchup[bot]@users.noreply.github.com>
2024-06-07 10:22:46 +02:00 · 2024-06-07 10:22:46 +02:00 · 540d88f809
commit 540d88f809
parent bd17a98386
126 changed files with 923 additions and 757 deletions
--- a/patches/node/.patches
+++ b/patches/node/.patches
@ -46,3 +46,5 @@ deprecate_vector_v8_local_in_v8.patch
 fix_remove_deprecated_errno_constants.patch
 build_enable_perfetto.patch
 fix_add_source_location_for_v8_task_runner.patch
+cherry-pick_src_remove_calls_to_recently_deprecated_v8_apis.patch
+test_update_v8-stats_test_for_v8_12_6.patch
--- a/patches/node/cherry-pick_src_remove_calls_to_recently_deprecated_v8_apis.patch
+++ b/patches/node/cherry-pick_src_remove_calls_to_recently_deprecated_v8_apis.patch
@ -0,0 +1,182 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Adam Klein <adamk@chromium.org>
+Date: Wed, 15 May 2024 09:16:00 +0200
+Subject: cherry-pick: src: remove calls to recently deprecated V8 APIs
+
+Node.js Commit: a6d54f179d997497a95c18456bef6bc3ee15e2c4
+Node.js PR: https://github.com/nodejs/node/pull/52996
+V8 API Removal CL: https://chromium-review.googlesource.com/c/v8/v8/+/5539888
+
+This patch is slightly modified from the original commit in order to
+resolve conflicts due to the base commit difference between the Node.js
+PR and the current upgrade roll.
+
+This patch is expected to be deleted once we catch up with a Node.js
+upgrade that includes the original Node.js commit above.
+
+diff --git a/src/module_wrap.cc b/src/module_wrap.cc
+index 9ad67e0993da4c3e3f8a14681edbf941cf14e2e6..29ed378d32d452518dc929e60e6038ba4ca38a5c 100644
+--- a/src/module_wrap.cc
+++ b/src/module_wrap.cc
+@@ -186,8 +186,7 @@ void ModuleWrap::New(const FunctionCallbackInfo<Value>& args) {
+       }
+ 
+       Local<String> source_text = args[2].As<String>();
+-      ScriptOrigin origin(isolate,
+-                          url,
+      ScriptOrigin origin(url,
+                           line_offset,
+                           column_offset,
+                           true,                             // is cross origin
+@@ -394,7 +393,6 @@ void ModuleWrap::Evaluate(const FunctionCallbackInfo<Value>& args) {
+ 
+   ShouldNotAbortOnUncaughtScope no_abort_scope(realm->env());
+   TryCatchScope try_catch(realm->env());
+-  Isolate::SafeForTerminationScope safe_for_termination(isolate);
+ 
+   bool timed_out = false;
+   bool received_signal = false;
+diff --git a/src/node_builtins.cc b/src/node_builtins.cc
+index f9a090f5c3e04403602ba383032e7f3230669a92..3f82db324d406e342abee23ab0d7f7c9807ff652 100644
+--- a/src/node_builtins.cc
+++ b/src/node_builtins.cc
+@@ -267,7 +267,7 @@ MaybeLocal<Function> BuiltinLoader::LookupAndCompileInternal(
+   std::string filename_s = std::string("node:") + id;
+   Local<String> filename =
+       OneByteString(isolate, filename_s.c_str(), filename_s.size());
+-  ScriptOrigin origin(isolate, filename, 0, 0, true);
+  ScriptOrigin origin(filename, 0, 0, true);
+ 
+   BuiltinCodeCacheData cached_data{};
+   {
+diff --git a/src/node_contextify.cc b/src/node_contextify.cc
+index df1d9cb4fd0442ec6ce6164a136b7a5fbcbe5b67..f6969e635f692b17b4efca1dfbee086a0199db6e 100644
+--- a/src/node_contextify.cc
+++ b/src/node_contextify.cc
+@@ -850,16 +850,15 @@ void ContextifyScript::New(const FunctionCallbackInfo<Value>& args) {
+   host_defined_options->Set(
+       isolate, loader::HostDefinedOptions::kID, id_symbol);
+ 
+-  ScriptOrigin origin(isolate,
+-                      filename,
+-                      line_offset,                          // line offset
+-                      column_offset,                        // column offset
+-                      true,                                 // is cross origin
+-                      -1,                                   // script id
+-                      Local<Value>(),                       // source map URL
+-                      false,                                // is opaque (?)
+-                      false,                                // is WASM
+-                      false,                                // is ES Module
+  ScriptOrigin origin(filename,
+                      line_offset,     // line offset
+                      column_offset,   // column offset
+                      true,            // is cross origin
+                      -1,              // script id
+                      Local<Value>(),  // source map URL
+                      false,           // is opaque (?)
+                      false,           // is WASM
+                      false,           // is ES Module
+                       host_defined_options);
+   ScriptCompiler::Source source(code, origin, cached_data);
+   ScriptCompiler::CompileOptions compile_options =
+@@ -971,7 +970,7 @@ MaybeLocal<Function> CompileFunction(Local<Context> context,
+                                      Local<String> filename,
+                                      Local<String> content,
+                                      std::vector<Local<String>>* parameters) {
+-  ScriptOrigin script_origin(context->GetIsolate(), filename, 0, 0, true);
+  ScriptOrigin script_origin(filename, 0, 0, true);
+   ScriptCompiler::Source script_source(content, script_origin);
+ 
+   return ScriptCompiler::CompileFunction(context,
+@@ -1081,7 +1080,6 @@ bool ContextifyScript::EvalMachine(Local<Context> context,
+   }
+ 
+   TryCatchScope try_catch(env);
+-  Isolate::SafeForTerminationScope safe_for_termination(env->isolate());
+   ContextifyScript* wrapped_script;
+   ASSIGN_OR_RETURN_UNWRAP(&wrapped_script, args.Holder(), false);
+   Local<UnboundScript> unbound_script =
+@@ -1244,8 +1242,7 @@ void ContextifyContext::CompileFunction(
+   Local<PrimitiveArray> host_defined_options =
+       GetHostDefinedOptions(isolate, id_symbol);
+   ScriptCompiler::Source source =
+-      GetCommonJSSourceInstance(isolate,
+-                                code,
+      GetCommonJSSourceInstance(code,
+                                 filename,
+                                 line_offset,
+                                 column_offset,
+@@ -1300,15 +1297,13 @@ void ContextifyContext::CompileFunction(
+ }
+ 
+ ScriptCompiler::Source ContextifyContext::GetCommonJSSourceInstance(
+-    Isolate* isolate,
+     Local<String> code,
+     Local<String> filename,
+     int line_offset,
+     int column_offset,
+     Local<PrimitiveArray> host_defined_options,
+     ScriptCompiler::CachedData* cached_data) {
+-  ScriptOrigin origin(isolate,
+-                      filename,
+  ScriptOrigin origin(filename,
+                       line_offset,     // line offset
+                       column_offset,   // column offset
+                       true,            // is cross origin
+@@ -1486,7 +1481,7 @@ void ContextifyContext::ContainsModuleSyntax(
+   Local<PrimitiveArray> host_defined_options =
+       GetHostDefinedOptions(isolate, id_symbol);
+   ScriptCompiler::Source source = GetCommonJSSourceInstance(
+-      isolate, code, filename, 0, 0, host_defined_options, nullptr);
+      code, filename, 0, 0, host_defined_options, nullptr);
+   ScriptCompiler::CompileOptions options = GetCompileOptions(source);
+ 
+   std::vector<Local<String>> params = GetCJSParameters(env->isolate_data());
+@@ -1534,7 +1529,7 @@ void ContextifyContext::ContainsModuleSyntax(
+               code,
+               String::NewFromUtf8(isolate, "})();").ToLocalChecked());
+           ScriptCompiler::Source wrapped_source = GetCommonJSSourceInstance(
+-              isolate, code, filename, 0, 0, host_defined_options, nullptr);
+              code, filename, 0, 0, host_defined_options, nullptr);
+           std::ignore = ScriptCompiler::CompileFunction(
+               context,
+               &wrapped_source,
+@@ -1587,8 +1582,7 @@ static void CompileFunctionForCJSLoader(
+ 
+   Local<Symbol> symbol = env->vm_dynamic_import_default_internal();
+   Local<PrimitiveArray> hdo = GetHostDefinedOptions(isolate, symbol);
+-  ScriptOrigin origin(isolate,
+-                      filename,
+  ScriptOrigin origin(filename,
+                       0,               // line offset
+                       0,               // column offset
+                       true,            // is cross origin
+diff --git a/src/node_contextify.h b/src/node_contextify.h
+index e96df803b7ec2aa1231d4ab5d4ae0fe863ceb672..d42b5e0c544e726fc3f6d8392a554df9aa480fe9 100644
+--- a/src/node_contextify.h
+++ b/src/node_contextify.h
+@@ -95,7 +95,6 @@ class ContextifyContext : public BaseObject {
+       v8::Local<v8::Symbol> id_symbol,
+       const errors::TryCatchScope& try_catch);
+   static v8::ScriptCompiler::Source GetCommonJSSourceInstance(
+-      v8::Isolate* isolate,
+       v8::Local<v8::String> code,
+       v8::Local<v8::String> filename,
+       int line_offset,
+diff --git a/test/cctest/test_environment.cc b/test/cctest/test_environment.cc
+index 64e38c83006a004ebc3519a5e9f8b04263244514..14e82cc80ff73084fb43b2ef07febfd2667a0abc 100644
+--- a/test/cctest/test_environment.cc
+++ b/test/cctest/test_environment.cc
+@@ -620,12 +620,9 @@ TEST_F(EnvironmentTest, SetImmediateMicrotasks) {
+ 
+ #ifndef _WIN32  // No SIGINT on Windows.
+ TEST_F(NodeZeroIsolateTestFixture, CtrlCWithOnlySafeTerminationTest) {
+-  // We need to go through the whole setup dance here because we want to
+-  // set only_terminate_in_safe_scope.
+   // Allocate and initialize Isolate.
+   v8::Isolate::CreateParams create_params;
+   create_params.array_buffer_allocator = allocator.get();
+-  create_params.only_terminate_in_safe_scope = true;
+   v8::Isolate* isolate = v8::Isolate::Allocate();
+   CHECK_NOT_NULL(isolate);
+   platform->RegisterIsolate(isolate, &current_loop);
--- a/patches/node/test_update_v8-stats_test_for_v8_12_6.patch
+++ b/patches/node/test_update_v8-stats_test_for_v8_12_6.patch
@ -0,0 +1,22 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: John Kleinschmidt <jkleinsc@electronjs.org>
+Date: Wed, 5 Jun 2024 16:39:41 -0400
+Subject: test: update v8-stats test for V8 12.6
+
+Refs: v8/v8@e30e228
+
+https://github.com/nodejs/node-v8/commit/ececfe7aea014c3719e1e5184a2ca99bb5abcaf1
+
+diff --git a/test/parallel/test-v8-stats.js b/test/parallel/test-v8-stats.js
+index 2366cbf716c11851bb3a759dce5db47d616516dc..9d2971ba9411bb98107f6a9acc8a07ec438b76e5 100644
+--- a/test/parallel/test-v8-stats.js
+++ b/test/parallel/test-v8-stats.js
+@@ -48,6 +48,8 @@ const expectedHeapSpaces = [
+   'read_only_space',
+   'shared_large_object_space',
+   'shared_space',
+  'shared_trusted_large_object_space',
+  'shared_trusted_space',
+   'trusted_large_object_space',
+   'trusted_space'
+ ];