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

Unsubscribe from NSNotificationCenter when WebContents is destroyed

Browse source 
Due to ref-counted references the NSView is not destroyed immediately
when WebContents is destroyed, so it is not reliable to do this in
the destructor.
This commit is contained in:
Cheng Zhao 2015-09-17 11:19:08 +08:00
parent fa588f104c
commit fc33eb99f7
3 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

1
brightray/browser/inspectable_web_contents_view_mac.mm
View file

@ -19,6 +19,7 @@ InspectableWebContentsViewMac::InspectableWebContentsViewMac(InspectableWebConte
} }
InspectableWebContentsViewMac::~InspectableWebContentsViewMac() { InspectableWebContentsViewMac::~InspectableWebContentsViewMac() {
[view_ removeObservers];
CloseDevTools(); CloseDevTools();
} }

1
brightray/browser/mac/bry_inspectable_web_contents_view.h
View file

@ -24,6 +24,7 @@ using brightray::InspectableWebContentsViewMac;
} }
- (instancetype)initWithInspectableWebContentsViewMac:(InspectableWebContentsViewMac*)view; - (instancetype)initWithInspectableWebContentsViewMac:(InspectableWebContentsViewMac*)view;
- (void)removeObservers;
- (void)notifyDevToolsFocused; - (void)notifyDevToolsFocused;
- (void)setDevToolsVisible:(BOOL)visible; - (void)setDevToolsVisible:(BOOL)visible;
- (BOOL)isDevToolsVisible; - (BOOL)isDevToolsVisible;

3
brightray/browser/mac/bry_inspectable_web_contents_view.mm
View file

@ -45,9 +45,8 @@ using namespace brightray;
return self; return self;
} }
- (void)dealloc { - (void)removeObservers {
[[NSNotificationCenter defaultCenter] removeObserver:self]; [[NSNotificationCenter defaultCenter] removeObserver:self];
[super dealloc];
} }
- (void)resizeSubviewsWithOldSize:(NSSize)oldBoundsSize { - (void)resizeSubviewsWithOldSize:(NSSize)oldBoundsSize {