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

Weak map only needs to be deleted for once

Browse source
This commit is contained in:
Cheng Zhao 2015-12-03 17:10:14 +08:00
parent eb8426269f
commit 48a11bd237
1 changed files with 5 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -98,11 +98,6 @@ class TrackableObject : public TrackableObjectBase {
return std::vector<v8::Local<v8::Object>>(); return std::vector<v8::Local<v8::Object>>();
} }
TrackableObject() {
RegisterDestructionCallback(
base::Bind(&TrackableObject<T>::ReleaseAllWeakReferences));
}
// Removes this instance from the weak map. // Removes this instance from the weak map.
void RemoveFromWeakMap() { void RemoveFromWeakMap() {
if (weak_map_ && weak_map_->Has(weak_map_id())) if (weak_map_ && weak_map_->Has(weak_map_id()))
@ -110,13 +105,17 @@ class TrackableObject : public TrackableObjectBase {
} }
protected: protected:
TrackableObject() {}
~TrackableObject() override { ~TrackableObject() override {
RemoveFromWeakMap(); RemoveFromWeakMap();
} }
void AfterInit(v8::Isolate* isolate) override { void AfterInit(v8::Isolate* isolate) override {
if (!weak_map_) if (!weak_map_) {
weak_map_.reset(new atom::IDWeakMap); weak_map_.reset(new atom::IDWeakMap);
RegisterDestructionCallback(
base::Bind(&TrackableObject<T>::ReleaseAllWeakReferences));
}
weak_map_id_ = weak_map_->Add(isolate, GetWrapper(isolate)); weak_map_id_ = weak_map_->Add(isolate, GetWrapper(isolate));
TrackableObjectBase::AfterInit(isolate); TrackableObjectBase::AfterInit(isolate);
} }