mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

chore: remove native_mate (Part 1) (#20085)

Browse source 
* move Destroyable utilities out of native_mate

* do not set "destroy" in ObjectTemplateBuilder

* remove ObjectTemplateBuilder::MakeDestroyable

* do not pollute gin namespace

* add more comments

* remove hack of Arguments
This commit is contained in:
Cheng Zhao 2019-09-04 11:14:16 +09:00 • committed by GitHub
parent 96b42bddb8
commit b601f3a031
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
17 changed files with 108 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

20
native_mate/native_mate/function_template.h
View file

@ -6,6 +6,7 @@
#define NATIVE_MATE_NATIVE_MATE_FUNCTION_TEMPLATE_H_
#include "../shell/common/error_util.h"
#include "../shell/common/gin_helper/destroyable.h"
#include "base/callback.h"
#include "base/logging.h"
#include "native_mate/arguments.h"
@ -20,23 +21,6 @@ enum CreateFunctionTemplateFlags {
namespace internal {
struct Destroyable {
static void Destroy(Arguments* args) {
if (IsDestroyed(args))
return;
v8::Local<v8::Object> holder = args->GetHolder();
delete static_cast<WrappableBase*>(
holder->GetAlignedPointerFromInternalField(0));
holder->SetAlignedPointerInInternalField(0, nullptr);
}
static bool IsDestroyed(Arguments* args) {
v8::Local<v8::Object> holder = args->GetHolder();
return holder->InternalFieldCount() == 0 ||
holder->GetAlignedPointerFromInternalField(0) == nullptr;
}
};
template <typename T>
struct CallbackParamTraits {
typedef T LocalType;
@ -166,7 +150,7 @@ struct ArgumentHolder {
ArgumentHolder(Arguments* args, int create_flags) {
if (index == 0 && (create_flags & HolderIsFirstArgument) &&
Destroyable::IsDestroyed(args)) {
gin_helper::Destroyable::IsDestroyed(args->GetHolder())) {
args->ThrowError("Object has been destroyed");
return;
}

6
native_mate/native_mate/object_template_builder.cc
View file

@ -28,12 +28,6 @@ ObjectTemplateBuilder& ObjectTemplateBuilder::SetPropertyImpl(
return *this;
}
ObjectTemplateBuilder& ObjectTemplateBuilder::MakeDestroyable() {
SetMethod("destroy", base::Bind(internal::Destroyable::Destroy));
SetMethod("isDestroyed", base::Bind(internal::Destroyable::IsDestroyed));
return *this;
}
v8::Local<v8::ObjectTemplate> ObjectTemplateBuilder::Build() {
v8::Local<v8::ObjectTemplate> result = template_;
template_.Clear();

3
native_mate/native_mate/object_template_builder.h
View file

@ -99,9 +99,6 @@ class ObjectTemplateBuilder {
CallbackTraits<U>::CreateTemplate(isolate_, setter));
}
// Add "destroy" and "isDestroyed" methods.
ObjectTemplateBuilder& MakeDestroyable();
v8::Local<v8::ObjectTemplate> Build();
private:

8
native_mate/native_mate/wrappable_base.h
View file

@ -5,12 +5,12 @@
#ifndef NATIVE_MATE_NATIVE_MATE_WRAPPABLE_BASE_H_
#define NATIVE_MATE_NATIVE_MATE_WRAPPABLE_BASE_H_
namespace mate {
namespace internal {
namespace gin {
struct Destroyable;
}
namespace mate {
// Wrappable is a base class for C++ objects that have corresponding v8 wrapper
// objects. To retain a Wrappable object on the stack, use a gin::Handle.
//
@ -48,7 +48,7 @@ class WrappableBase {
virtual void InitWith(v8::Isolate* isolate, v8::Local<v8::Object> wrapper);
private:
friend struct internal::Destroyable;
friend struct gin::Destroyable;
static void FirstWeakCallback(
const v8::WeakCallbackInfo<WrappableBase>& data);