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

Upstream good ideas from Muon

Browse source
This commit is contained in:
Matt Crocker 2017-10-23 22:38:55 -07:00
parent ca8f45a501
commit c5914516c8
2 changed files with 9 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

7
atom/browser/api/event_emitter.h
View file

@ -79,8 +79,11 @@ class EventEmitter : public Wrappable<T> {
const Args&... args) {
v8::Locker locker(isolate());
v8::HandleScope handle_scope(isolate());
v8::Local<v8::Object> event = internal::CreateJSEvent(
isolate(), GetWrapper(), sender, message);
v8::Local<v8::Object> wrapper = GetWrapper();
if (wrapper.IsEmpty())
return false;
v8::Local<v8::Object> event = internal::CreateJSEvent(
isolate(), wrapper, sender, message);
return EmitWithEvent(name, event, args...);
}

5
atom/browser/api/trackable_object.h
View file

@ -62,7 +62,10 @@ class TrackableObject : public TrackableObjectBase,
public:
// Mark the JS object as destroyed.
void MarkDestroyed() {
Wrappable<T>::GetWrapper()->SetAlignedPointerInInternalField(0, nullptr);
v8::Local<v8::Object> wrapper = Wrappable<T>::GetWrapper();
if (!wrapper.IsEmpty()) {
Wrappable<T>::GetWrapper()->SetAlignedPointerInInternalField(0, nullptr);
}
}
bool IsDestroyed() {