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

It is fine to leak a V8 handle on exit

Browse source
This commit is contained in:
Cheng Zhao 2015-12-03 16:33:57 +08:00
parent 117b7462de
commit 1e7c8c9fda
1 changed files with 1 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
atom/common/native_mate_converters/callback.cc
View file

@ -4,7 +4,6 @@
#include "atom/common/native_mate_converters/callback.h" #include "atom/common/native_mate_converters/callback.h"
#include "atom/browser/atom_browser_main_parts.h"
#include "content/public/browser/browser_thread.h" #include "content/public/browser/browser_thread.h"
using content::BrowserThread; using content::BrowserThread;
@ -78,15 +77,7 @@ class RefCountedGlobal : public base::RefCountedThreadSafe<RefCountedGlobal<T>,
DeleteOnUIThread> { DeleteOnUIThread> {
public: public:
RefCountedGlobal(v8::Isolate* isolate, v8::Local<v8::Value> value) RefCountedGlobal(v8::Isolate* isolate, v8::Local<v8::Value> value)
: handle_(isolate, v8::Local<T>::Cast(value)), : handle_(isolate, v8::Local<T>::Cast(value)) {
weak_factory_(this) {
// In browser process, we need to ensure the V8 handle is destroyed before
// the JavaScript env gets destroyed.
if (Locker::IsBrowserProcess() && atom::AtomBrowserMainParts::Get()) {
atom::AtomBrowserMainParts::Get()->RegisterDestructionCallback(
base::Bind(&RefCountedGlobal<T>::FreeHandle,
weak_factory_.GetWeakPtr()));
}
} }
bool IsAlive() const { bool IsAlive() const {
@ -98,12 +89,7 @@ class RefCountedGlobal : public base::RefCountedThreadSafe<RefCountedGlobal<T>,
} }
private: private:
void FreeHandle() {
handle_.Reset();
}
v8::Global<T> handle_; v8::Global<T> handle_;
base::WeakPtrFactory<RefCountedGlobal<T>> weak_factory_;
DISALLOW_COPY_AND_ASSIGN(RefCountedGlobal); DISALLOW_COPY_AND_ASSIGN(RefCountedGlobal);
}; };