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

Fix a crash when destroying window.

Browse source
This commit is contained in:
Cheng Zhao 2014-04-11 18:43:01 +08:00
parent 84d458687a
commit 5c5cf3c66e
3 changed files with 16 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

10
atom/browser/native_window.h
View file

@ -196,6 +196,9 @@ class NativeWindow : public brightray::DefaultWebContentsDelegate,
void NotifyWindowClosed();
void NotifyWindowBlur();
// Destroy the inspectable_web_contents.
void DestroyWebContents();
// Called when the window needs to update its draggable region.
virtual void UpdateDraggableRegions(
const std::vector<DraggableRegion>& regions) = 0;
@ -251,8 +254,6 @@ 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);
@ -307,6 +308,11 @@ class NativeWindow : public brightray::DefaultWebContentsDelegate,
scoped_ptr<AtomJavaScriptDialogManager> dialog_manager_;
// Notice that inspectable_web_contents_ must be placed after dialog_manager_,
// so we can make sure inspectable_web_contents_ is destroyed before
// dialog_manager_, otherwise a crash would happen.
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;
PathsMap saved_files_;