mirror of
https://github.com/electron/electron.git
synced 2026-04-10 03:01:51 -04:00
d6e0c270d1
* chore: bump chromium in DEPS to 147.0.7724.0 * chore: bump chromium in DEPS to 147.0.7725.0 * chore: bump chromium in DEPS to 147.0.7727.0 * chore: update patches Refs https://chromium-review.googlesource.com/c/chromium/src/+/7633903 * fix: pass weak-ptr-bound callback to OnCommandsChanged Refs https://chromium-review.googlesource.com/c/chromium/src/+/7622614 * fix: add missing option to CSS corner smoothing property Refs https://chromium-review.googlesource.com/c/chromium/src/+/7646628 --------- Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: Samuel Maddock <samuelmaddock@electronjs.org>
44 lines
2.0 KiB
Diff
44 lines
2.0 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 0e4f17437ea2c687cb188e59b3b044557d6ad5fe..4c0c31a07b83506bb5f07a228ca79fb0c866d3fd 100644
|
|
--- a/gin/object_template_builder.cc
|
|
+++ b/gin/object_template_builder.cc
|
|
@@ -145,6 +145,13 @@ ObjectTemplateBuilder::ObjectTemplateBuilder(v8::Isolate* isolate,
|
|
template_->SetInternalFieldCount(kNumberOfInternalFields);
|
|
}
|
|
|
|
+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();
|
|
|