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

mac: InspectableWebContents should be destroyed before release NSWindow.

Browse source 
Fixes atom/atom#1841.
This commit is contained in:
Cheng Zhao 2014-04-11 12:32:42 +08:00
parent e576d4c014
commit d6079782d1
3 changed files with 13 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

3
atom/browser/native_window.h
View file

@ -251,6 +251,8 @@ class NativeWindow : public brightray::DefaultWebContentsDelegate,
// Window icon.
gfx::Image icon_;
scoped_ptr<brightray::InspectableWebContents> inspectable_web_contents_;
private:
// Schedule a notification unresponsive event.
void ScheduleUnresponsiveEvent(int ms);
@ -304,7 +306,6 @@ class NativeWindow : public brightray::DefaultWebContentsDelegate,
scoped_ptr<DevToolsWebContentsObserver> devtools_web_contents_observer_;
scoped_ptr<AtomJavaScriptDialogManager> dialog_manager_;
scoped_ptr<brightray::InspectableWebContents> inspectable_web_contents_;
// Maps url to file path, used by the file requests sent from devtools.
typedef std::map<std::string, base::FilePath> PathsMap;