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

only mark handle as independent when it's a high memory user

Browse source
This commit is contained in:
Heilig Benedek 2017-11-27 00:50:51 +01:00
parent bf92fa88b7
commit 40bd3336a5
2 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
native_mate/wrappable.cc
View file

@ -17,7 +17,7 @@ WrappableBase::WrappableBase()
WrappableBase::~WrappableBase() { WrappableBase::~WrappableBase() {
if (wrapper_.IsEmpty()) if (wrapper_.IsEmpty())
return; return;
GetWrapper()->SetAlignedPointerInInternalField(0, nullptr); GetWrapper()->SetAlignedPointerInInternalField(0, nullptr);
wrapper_.ClearWeak(); wrapper_.ClearWeak();
wrapper_.Reset(); wrapper_.Reset();
@ -38,7 +38,9 @@ void WrappableBase::InitWith(v8::Isolate* isolate,
wrapper->SetAlignedPointerInInternalField(0, this); wrapper->SetAlignedPointerInInternalField(0, this);
wrapper_.Reset(isolate, wrapper); wrapper_.Reset(isolate, wrapper);
wrapper_.SetWeak(this, FirstWeakCallback, v8::WeakCallbackType::kParameter); wrapper_.SetWeak(this, FirstWeakCallback, v8::WeakCallbackType::kParameter);
wrapper_.MarkIndependent();
if (high_memory_)
wrapper_.MarkIndependent();
// Call object._init if we have one. // Call object._init if we have one.
v8::Local<v8::Function> init; v8::Local<v8::Function> init;
@ -48,6 +50,12 @@ void WrappableBase::InitWith(v8::Isolate* isolate,
AfterInit(isolate); AfterInit(isolate);
} }
void WrappableBase::MarkHighMemoryUsage() {
high_memory_ = true;
if (!wrapper_.IsEmpty())
wrapper_.MarkIndependent();
}
// static // static
void WrappableBase::FirstWeakCallback( void WrappableBase::FirstWeakCallback(
const v8::WeakCallbackInfo<WrappableBase>& data) { const v8::WeakCallbackInfo<WrappableBase>& data) {

2
native_mate/wrappable_base.h
View file

@ -46,7 +46,7 @@ class WrappableBase {
// Marks wrapped object as high memory usage // Marks wrapped object as high memory usage
// Deletes the wrapped object on the first round of GC callbacks // Deletes the wrapped object on the first round of GC callbacks
void MarkHighMemoryUsage() { high_memory_ = true; } virtual void MarkHighMemoryUsage();
private: private:
friend struct internal::Destroyable; friend struct internal::Destroyable;