chore: bump chromium to 136.0.7053.1 (main) (#45906)
* chore: bump chromium in DEPS to 136.0.7052.0 * chore: update mas_avoid_private_macos_api_usage.patch.patch6318359
patch applied manually due to context shear * chore: update preconnect_manager.patch Xref:6318420
patch applied manually due to context shear * chore: e patches all * chore: bump chromium to 136.0.7053.1 * chore: update fix_remove_profiles_from_spellcheck_service.patch Xref:6326575
patch applied manually due to context shear * chore: e patches all * chore: revert removal of v8 API used by Node.js * devtools: Remove DevToolsUIBindings::SendJsonRequest() |6326236
* 6244461: Merge //content/common/user_agent.cc into //components/embedder_support:user_agent |6244461
* 6313744: Migrate views::Background factory methods to ColorVariant |6313744
* 6314545: Remove multiple argument support from base::ToString() |6314545
* 6317362: [Extensions] Inline MessagingDelegate::CreateReceiverForTab() |6317362
* 6308998: Add SettingAccess structured metrics event for DevTools |6308998
* 6295214: Remove redundant state field in per-extension preferences |6295214
NB: this change is copied from the upstream change to extensions/shell/browser/shell_extension_loader.cc * fix: ui/ linter error This is showing up in an eslint build step in Electron: > /__w/electron/electron/src/out/Default/gen/ui/webui/resources/cr_elements/preprocessed/cr_menu_selector/cr_menu_selector.ts > 77:23 error This assertion is unnecessary since the receiver accepts the original type of the expression @typescript-eslint/no-unnecessary-type-assertion > > ✖ 1 problem (1 error, 0 warnings) > 1 error and 0 warnings potentially fixable with the `--fix` option. However, removing the assertion causes a typescript build failure: > gen/ui/webui/resources/cr_elements/preprocessed/cr_menu_selector/cr_menu_selector.ts:77:23 - error TS2345: Argument of type 'HTMLElement | null' is not assignable to parameter of type 'HTMLElement'. > Type 'null' is not assignable to type 'HTMLElement'. > > 77 items.indexOf(this.querySelector<HTMLElement>(':focus')); > ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ So I think the two different steps may be picking up typescript definitions. This patch should be removed after the issue is tracked down and fixed in a followup task. * fix: -Wnonnull warning Fixes this warning: > 2025-03-07T01:05:01.8637705Z ../../third_party/electron_node/src/debug_utils.cc(257,12): error: null passed to a callee that requires a non-null argument [-Werror,-Wnonnull] > 2025-03-07T01:05:01.8638267Z 257 | return nullptr; > 2025-03-07T01:05:01.8638481Z | ^~~~~~~ > 2025-03-07T01:05:01.8638700Z 1 error generated. Not sure why this warning was never triggered before; `git blame` indicates this code hasn't changed in ages: > c40a8273ef2 (Michaël Zasso 2024-05-10 09:50:20 +0200 255) #endif // DEBUG > 8e2d33f1562 (Anna Henningsen 2018-06-07 16:54:29 +0200 256) } > 247b5130595 (Refael Ackermann 2018-10-22 15:07:00 -0400 257) return nullptr; > 247b5130595 (Refael Ackermann 2018-10-22 15:07:00 -0400 258) } Presumably this is failing in this Chromium roll due to a clang version bump. We should remove this patch after upstreaming it. * docs: add upstream pr link for Node patch --------- Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: Charles Kerr <charles@charleskerr.com>
This commit is contained in:
parent
530ccfe350
commit
458b14b8ed
79 changed files with 490 additions and 334 deletions
|
@ -1,2 +1,3 @@
|
|||
chore_allow_customizing_microtask_policy_per_context.patch
|
||||
deps_add_v8_object_setinternalfieldfornodecore.patch
|
||||
revert_api_delete_deprecated_attachcppheap_and_detachcppheap.patch
|
||||
|
|
|
@ -46,10 +46,10 @@ index 3e57ae8efe33f326ef0e5d609c311d4be5b8afd6..dc521d39c2280dfc3217e97c1e413b2b
|
|||
V8_INLINE static void* GetAlignedPointerFromInternalField(
|
||||
const BasicTracedReference<Object>& object, int index) {
|
||||
diff --git a/src/api/api.cc b/src/api/api.cc
|
||||
index 412179152521fa45eab085818b9d9a5a0c274362..9eeb209ca92fd372d38f1d6dd0b096cee32d1061 100644
|
||||
index 3e6a975f912cf482fbf668142080df7e9aa80455..64044e9cf44d401c249787feafb651688ee0d9f9 100644
|
||||
--- a/src/api/api.cc
|
||||
+++ b/src/api/api.cc
|
||||
@@ -6385,14 +6385,33 @@ Local<Data> v8::Object::SlowGetInternalField(int index) {
|
||||
@@ -6322,14 +6322,33 @@ Local<Data> v8::Object::SlowGetInternalField(int index) {
|
||||
i::Cast<i::JSObject>(*obj)->GetEmbedderField(index), isolate));
|
||||
}
|
||||
|
||||
|
|
|
@ -0,0 +1,137 @@
|
|||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: Charles Kerr <charles@charleskerr.com>
|
||||
Date: Thu, 6 Mar 2025 14:31:19 -0600
|
||||
Subject: Revert "[api] Delete deprecated AttachCppHeap and DetachCppHeap"
|
||||
|
||||
Restore this API because Node.js needs it.
|
||||
|
||||
This patch can be removed after an upstream fix lands in Node.js,
|
||||
e.g. in https://github.com/nodejs/node-v8/tree/canary
|
||||
|
||||
diff --git a/include/v8-isolate.h b/include/v8-isolate.h
|
||||
index 97f1030dd2ca47ca4b58ac64e2e11e615bc46130..24ef6b5e0af63179e557b9896134838e112c59db 100644
|
||||
--- a/include/v8-isolate.h
|
||||
+++ b/include/v8-isolate.h
|
||||
@@ -1172,6 +1172,28 @@ class V8_EXPORT Isolate {
|
||||
*/
|
||||
void SetEmbedderRootsHandler(EmbedderRootsHandler* handler);
|
||||
|
||||
+ /**
|
||||
+ * Attaches a managed C++ heap as an extension to the JavaScript heap. The
|
||||
+ * embedder maintains ownership of the CppHeap. At most one C++ heap can be
|
||||
+ * attached to V8.
|
||||
+ *
|
||||
+ * Multi-threaded use requires the use of v8::Locker/v8::Unlocker, see
|
||||
+ * CppHeap.
|
||||
+ *
|
||||
+ * If a CppHeap is set via CreateParams, then this call is a noop.
|
||||
+ */
|
||||
+ V8_DEPRECATED("Set the heap on Isolate creation using CreateParams instead.")
|
||||
+ void AttachCppHeap(CppHeap*);
|
||||
+
|
||||
+ /**
|
||||
+ * Detaches a managed C++ heap if one was attached using `AttachCppHeap()`.
|
||||
+ *
|
||||
+ * If a CppHeap is set via CreateParams, then this call is a noop.
|
||||
+ */
|
||||
+ V8_DEPRECATED(
|
||||
+ "The CppHeap gets detached automatically during Isolate tear down.")
|
||||
+ void DetachCppHeap();
|
||||
+
|
||||
using ReleaseCppHeapCallback = void (*)(std::unique_ptr<CppHeap>);
|
||||
|
||||
/**
|
||||
@@ -1219,7 +1241,6 @@ class V8_EXPORT Isolate {
|
||||
class V8_DEPRECATED("AtomicsWaitWakeHandle is unused and will be removed.")
|
||||
#endif
|
||||
V8_EXPORT AtomicsWaitWakeHandle {
|
||||
-
|
||||
public:
|
||||
/**
|
||||
* Stop this `Atomics.wait()` call and call the |AtomicsWaitCallback|
|
||||
diff --git a/src/api/api.cc b/src/api/api.cc
|
||||
index 64044e9cf44d401c249787feafb651688ee0d9f9..1677e54b188b6a1699370d8cff37d2acf2933f38 100644
|
||||
--- a/src/api/api.cc
|
||||
+++ b/src/api/api.cc
|
||||
@@ -9876,6 +9876,16 @@ void Isolate::SetEmbedderRootsHandler(EmbedderRootsHandler* handler) {
|
||||
i_isolate->heap()->SetEmbedderRootsHandler(handler);
|
||||
}
|
||||
|
||||
+void Isolate::AttachCppHeap(CppHeap* cpp_heap) {
|
||||
+ i::Isolate* i_isolate = reinterpret_cast<i::Isolate*>(this);
|
||||
+ i_isolate->heap()->AttachCppHeap(cpp_heap);
|
||||
+}
|
||||
+
|
||||
+void Isolate::DetachCppHeap() {
|
||||
+ i::Isolate* i_isolate = reinterpret_cast<i::Isolate*>(this);
|
||||
+ i_isolate->heap()->DetachCppHeap();
|
||||
+}
|
||||
+
|
||||
CppHeap* Isolate::GetCppHeap() const {
|
||||
const i::Isolate* i_isolate = reinterpret_cast<const i::Isolate*>(this);
|
||||
return i_isolate->heap()->cpp_heap();
|
||||
diff --git a/src/heap/cppgc-js/cpp-heap.cc b/src/heap/cppgc-js/cpp-heap.cc
|
||||
index e033791ca1cdeba4a304e69b922d4169a22f9caa..706f81f7bbc1b5a7a1b73afe018b0b2c0184d9ef 100644
|
||||
--- a/src/heap/cppgc-js/cpp-heap.cc
|
||||
+++ b/src/heap/cppgc-js/cpp-heap.cc
|
||||
@@ -513,6 +513,11 @@ CppHeap::CppHeap(
|
||||
}
|
||||
|
||||
CppHeap::~CppHeap() {
|
||||
+ if (isolate_) {
|
||||
+ // TODO(ahaas): Delete this code once `v8::Isolate::DetachCppHeap` has been
|
||||
+ // deleted.
|
||||
+ isolate_->heap()->DetachCppHeap();
|
||||
+ }
|
||||
Terminate();
|
||||
}
|
||||
|
||||
diff --git a/src/heap/heap.cc b/src/heap/heap.cc
|
||||
index da9d8810b307e94f01238e56532a0ff93f1ff325..252a1b354110764c6351119d41a4adddca0c2913 100644
|
||||
--- a/src/heap/heap.cc
|
||||
+++ b/src/heap/heap.cc
|
||||
@@ -6056,6 +6056,21 @@ void Heap::AttachCppHeap(v8::CppHeap* cpp_heap) {
|
||||
cpp_heap_ = cpp_heap;
|
||||
}
|
||||
|
||||
+void Heap::DetachCppHeap() {
|
||||
+ // The API function should be a noop in case a CppHeap was passed on Isolate
|
||||
+ // creation.
|
||||
+ if (owning_cpp_heap_) {
|
||||
+ return;
|
||||
+ }
|
||||
+
|
||||
+ // The CppHeap may have been detached already.
|
||||
+ if (!cpp_heap_) return;
|
||||
+
|
||||
+ CppHeap::From(cpp_heap_)->StartDetachingIsolate();
|
||||
+ CppHeap::From(cpp_heap_)->DetachIsolate();
|
||||
+ cpp_heap_ = nullptr;
|
||||
+}
|
||||
+
|
||||
std::optional<StackState> Heap::overridden_stack_state() const {
|
||||
if (!embedder_stack_state_origin_) return {};
|
||||
return embedder_stack_state_;
|
||||
diff --git a/src/heap/heap.h b/src/heap/heap.h
|
||||
index 570cb682903cbead5f8f80573290b13ab1d81183..bccdb6c1bdb8fbbc6cc5aee0e54105f210ca2ab9 100644
|
||||
--- a/src/heap/heap.h
|
||||
+++ b/src/heap/heap.h
|
||||
@@ -1104,6 +1104,9 @@ class Heap final {
|
||||
// Unified heap (C++) support. ===============================================
|
||||
// ===========================================================================
|
||||
|
||||
+ V8_EXPORT_PRIVATE void AttachCppHeap(v8::CppHeap* cpp_heap);
|
||||
+ V8_EXPORT_PRIVATE void DetachCppHeap();
|
||||
+
|
||||
v8::CppHeap* cpp_heap() const { return cpp_heap_; }
|
||||
|
||||
std::optional<StackState> overridden_stack_state() const;
|
||||
@@ -1645,8 +1648,6 @@ class Heap final {
|
||||
private:
|
||||
class AllocationTrackerForDebugging;
|
||||
|
||||
- void AttachCppHeap(v8::CppHeap* cpp_heap);
|
||||
-
|
||||
using ExternalStringTableUpdaterCallback =
|
||||
Tagged<String> (*)(Heap* heap, FullObjectSlot pointer);
|
||||
|
Loading…
Add table
Add a link
Reference in a new issue