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

Refactor NativeWindow (Part 6): Move NativeWindow bindings to api::TopLevelWindow (#12596)

Browse source 
* Add atom::api::TopLevelWindow

* Make BrowserWindow inherit TopLevelWindow

* Fix reading from wrong weak map

* Read options after setting content view

* OnWindowClosed is not guarenteed to run now

* Fix the offscreen hack in BrowserWindow

* Fix building on Linux

* Fix tests on Linux

* Fix building on Windows
This commit is contained in:
Cheng Zhao 2018-04-14 11:04:23 +09:00 • committed by GitHub
parent 23bb3bd963
commit 858828d343
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
10 changed files with 1406 additions and 1256 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -107,7 +107,9 @@ class TrackableObject : public TrackableObjectBase,
}
protected:
TrackableObject() {}
TrackableObject() {
weak_map_id_ = ++next_id_;
}
~TrackableObject() override {
RemoveFromWeakMap();
@ -118,7 +120,6 @@ class TrackableObject : public TrackableObjectBase,
if (!weak_map_) {
weak_map_ = new atom::KeyWeakMap<int32_t>;
}
weak_map_id_ = ++next_id_;
weak_map_->Set(isolate, weak_map_id_, wrapper);
}