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

fix: unsubscribe from observers when window is closing (#25554)

Browse source
This commit is contained in:
Cheng Zhao 2020-09-23 10:53:32 +09:00 • committed by GitHub
parent 29c6864ee1
commit 22c6c891be
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 11 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

15
shell/browser/native_window_mac.mm
View file

@ -536,10 +536,12 @@ NativeWindowMac::NativeWindowMac(const gin_helper::Dictionary& options,
original_level_ = [window_ level];
}
NativeWindowMac::~NativeWindowMac() {
NativeWindowMac::~NativeWindowMac() {}
void NativeWindowMac::Cleanup() {
DCHECK(!IsClosed());
ui::NativeTheme::GetInstanceForNativeUi()->RemoveObserver(this);
if (wheel_event_monitor_)
[NSEvent removeMonitor:wheel_event_monitor_];
[NSEvent removeMonitor:wheel_event_monitor_];
}
void NativeWindowMac::RedrawTrafficLights() {
@ -635,13 +637,6 @@ void NativeWindowMac::Close() {
}
void NativeWindowMac::CloseImmediately() {
// Remove event monitor before destroying window, otherwise the monitor may
// call its callback after window has been destroyed.
if (wheel_event_monitor_) {
[NSEvent removeMonitor:wheel_event_monitor_];
wheel_event_monitor_ = nil;
}
// Retain the child window before closing it. If the last reference to the
// NSWindow goes away inside -[NSWindow close], then bad stuff can happen.
// See e.g. http://crbug.com/616701.