mirror of
https://github.com/electron/electron.git
synced 2026-04-10 03:01:51 -04:00
095ae30f6d
chore: bump chromium to 140.0.7339.2 (main) (#47929) * chore: bump chromium in DEPS to 140.0.7330.0 * chore: bump chromium in DEPS to 140.0.7331.0 * chore: update patches * fix: gn check failing on crashpad.h Not yet sure what caused this * fix: predictors::PreconnectManager -> content::PreconnectManager CL: https://chromium-review.googlesource.com/c/chromium/src/+/6788473 * chore: bump chromium in DEPS to 140.0.7333.0 * chore: bump chromium in DEPS to 140.0.7335.0 * chore: bump chromium in DEPS to 140.0.7337.0 * chore: update patches * chore: restore some gin utility * 6804057: [Extensions] Validate nodoc is specified as a boolean in schemas https://chromium-review.googlesource.com/c/chromium/src/+/6804057 * fixup! chore: restore some gin utility * fixup! fix: predictors::PreconnectManager -> content::PreconnectManager CL: https://chromium-review.googlesource.com/c/chromium/src/+/6788473 * 6772346: Reset MouseWheelPhaseHandler state when trackpoint scroll is detected https://chromium-review.googlesource.com/c/chromium/src/+/6772346 Not certain about what the "correct" argument to pass here is. A quick dive into the CL suggests that passing `false` is safe to keep things working. The blast radius if this assumption is wrong is that "fling" scroll gestures may not work as expected with the OSR. * 6789383: Uninstall SODA language pack after 30 days of inactivity https://chromium-review.googlesource.com/c/chromium/src/+/6789383 * chore: update libcxx filenames * chore: bump chromium in DEPS to 140.0.7339.0 * chore: update patches * fixup! 6772346: Reset MouseWheelPhaseHandler state when trackpoint scroll is detected https://chromium-review.googlesource.com/c/chromium/src/+/6772346 * chore: bump chromium in DEPS to 140.0.7339.2 --------- Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: Samuel Maddock <smaddock@slack-corp.com> Co-authored-by: deepak1556 <hop2deep@gmail.com>
44 lines
1.9 KiB
Diff
44 lines
1.9 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: John Kleinschmidt <jkleinsc@electronjs.org>
|
|
Date: Fri, 6 Oct 2023 14:15:20 -0400
|
|
Subject: feat: allow passing of ObjectTemplate to ObjectTemplateBuilder
|
|
|
|
https://chromium-review.googlesource.com/c/chromium/src/+/4905829 removed the
|
|
ObjectTemplateBuilder constructor which allows passing in an ObjectTemplate.
|
|
|
|
Electron needs this constructor, namely for gin_helper::Constructible
|
|
objects.
|
|
|
|
diff --git a/gin/object_template_builder.cc b/gin/object_template_builder.cc
|
|
index 9f9ae85ad432ce71f308d6c56265a96985f42766..5a31687bbd0fca61db3a7c41ed73d938340d6446 100644
|
|
--- a/gin/object_template_builder.cc
|
|
+++ b/gin/object_template_builder.cc
|
|
@@ -144,6 +144,13 @@ ObjectTemplateBuilder::ObjectTemplateBuilder(v8::Isolate* isolate,
|
|
template_->SetInternalFieldCount(0);
|
|
}
|
|
|
|
+ObjectTemplateBuilder::ObjectTemplateBuilder(v8::Isolate* isolate,
|
|
+ const char* type_name,
|
|
+ v8::Local<v8::ObjectTemplate> tmpl)
|
|
+ : isolate_(isolate), type_name_(type_name), template_(tmpl) {
|
|
+ template_->SetInternalFieldCount(kNumberOfInternalFields);
|
|
+}
|
|
+
|
|
ObjectTemplateBuilder::ObjectTemplateBuilder(
|
|
const ObjectTemplateBuilder& other) = default;
|
|
|
|
diff --git a/gin/object_template_builder.h b/gin/object_template_builder.h
|
|
index cf4f1ae6598fdede655d33baccda254965566ea5..a4c16dc0ec3ff16413fc2a04225a2401989a084b 100644
|
|
--- a/gin/object_template_builder.h
|
|
+++ b/gin/object_template_builder.h
|
|
@@ -48,6 +48,9 @@ class GIN_EXPORT ObjectTemplateBuilder {
|
|
public:
|
|
explicit ObjectTemplateBuilder(v8::Isolate* isolate);
|
|
ObjectTemplateBuilder(v8::Isolate* isolate, const char* type_name);
|
|
+ ObjectTemplateBuilder(v8::Isolate* isolate,
|
|
+ const char* type_name,
|
|
+ v8::Local<v8::ObjectTemplate> tmpl);
|
|
ObjectTemplateBuilder(const ObjectTemplateBuilder& other);
|
|
~ObjectTemplateBuilder();
|
|
|