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

refactor: KeyWeakMap cleanup (#41242)

Browse source 
* refactor: make KeyWeakMap::KeyObject private

* perf: avoid redundant map lookup

* refactor: remove unused KeyWeakMap::Has()

* refactor: make KeyWeakMap dtor nonvirtual

no inheritance used, so no need for virtual dtor?

* chore: fix KeyWeakMap code comment

* refactor: use if statement in KeyWeakMap::Get()

* refactor: use better variable names in KeyWeakMap::Values()
This commit is contained in:
Charles Kerr 2024-02-06 09:18:05 -06:00 • committed by GitHub
parent 768ece6b54
commit 5686f88bd2
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 16 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

2
shell/common/gin_helper/trackable_object.h
View file

@ -107,7 +107,7 @@ class TrackableObject : public TrackableObjectBase, public EventEmitter<T> {
// 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_->Remove(weak_map_id()); weak_map_->Remove(weak_map_id());
} }

35
shell/common/key_weak_map.h
View file

@ -9,24 +9,17 @@
#include <utility> #include <utility>
#include <vector> #include <vector>
#include "base/containers/contains.h"
#include "base/memory/raw_ptr.h" #include "base/memory/raw_ptr.h"
#include "v8/include/v8.h" #include "v8/include/v8.h"
namespace electron { namespace electron {
// Like ES6's WeakMap, but the key is Integer and the value is Weak Pointer. // Like ES6's WeakMap, with a K key and Weak Pointer value.
template <typename K> template <typename K>
class KeyWeakMap { class KeyWeakMap {
public: public:
// Records the key and self, used by SetWeak.
struct KeyObject {
K key;
raw_ptr<KeyWeakMap> self;
};
KeyWeakMap() {} KeyWeakMap() {}
virtual ~KeyWeakMap() { ~KeyWeakMap() {
for (auto& p : map_) for (auto& p : map_)
p.second.second.ClearWeak(); p.second.second.ClearWeak();
} }
@ -45,23 +38,19 @@ class KeyWeakMap {
// Gets the object from WeakMap by its |key|. // Gets the object from WeakMap by its |key|.
v8::MaybeLocal<v8::Object> Get(v8::Isolate* isolate, const K& key) { v8::MaybeLocal<v8::Object> Get(v8::Isolate* isolate, const K& key) {
auto iter = map_.find(key); if (auto iter = map_.find(key); iter != map_.end())
if (iter == map_.end())
return v8::MaybeLocal<v8::Object>();
else
return v8::Local<v8::Object>::New(isolate, iter->second.second); return v8::Local<v8::Object>::New(isolate, iter->second.second);
return {};
} }
// Whether there is an object with |key| in this WeakMap.
constexpr bool Has(const K& key) const { return base::Contains(map_, key); }
// Returns all objects. // Returns all objects.
std::vector<v8::Local<v8::Object>> Values(v8::Isolate* isolate) const { std::vector<v8::Local<v8::Object>> Values(v8::Isolate* isolate) const {
std::vector<v8::Local<v8::Object>> keys; std::vector<v8::Local<v8::Object>> values;
keys.reserve(map_.size()); values.reserve(map_.size());
for (const auto& it : map_) for (const auto& it : map_)
keys.emplace_back(v8::Local<v8::Object>::New(isolate, it.second.second)); values.emplace_back(
return keys; v8::Local<v8::Object>::New(isolate, it.second.second));
return values;
} }
// Remove object with |key| in the WeakMap. // Remove object with |key| in the WeakMap.
@ -75,6 +64,12 @@ class KeyWeakMap {
} }
private: private:
// Records the key and self, used by SetWeak.
struct KeyObject {
K key;
raw_ptr<KeyWeakMap> self;
};
static void OnObjectGC( static void OnObjectGC(
const v8::WeakCallbackInfo<typename KeyWeakMap<K>::KeyObject>& data) { const v8::WeakCallbackInfo<typename KeyWeakMap<K>::KeyObject>& data) {
KeyWeakMap<K>::KeyObject* key_object = data.GetParameter(); KeyWeakMap<K>::KeyObject* key_object = data.GetParameter();