diff --git a/atom/browser/native_window.cc b/atom/browser/native_window.cc index 5481bfa1d67c..ca3e8789f294 100644 --- a/atom/browser/native_window.cc +++ b/atom/browser/native_window.cc @@ -449,6 +449,9 @@ void NativeWindow::MoveContents(content::WebContents* source, } void NativeWindow::CloseContents(content::WebContents* source) { + // Destroy the WebContents before we close the window. + DestroyWebContents(); + // When the web contents is gone, close the window immediately, but the // memory will not be freed until you call delete. // In this way, it would be safe to manage windows via smart pointers. If you diff --git a/atom/browser/native_window_mac.mm b/atom/browser/native_window_mac.mm index f2ff9b2235d8..cac5d63e0202 100644 --- a/atom/browser/native_window_mac.mm +++ b/atom/browser/native_window_mac.mm @@ -241,7 +241,6 @@ void NativeWindowMac::Close() { void NativeWindowMac::CloseImmediately() { [window_ close]; - window_.reset(); } void NativeWindowMac::Move(const gfx::Rect& pos) { diff --git a/script/lib/config.py b/script/lib/config.py index dda01b0bec9a..b28eebe77b42 100644 --- a/script/lib/config.py +++ b/script/lib/config.py @@ -5,7 +5,7 @@ import sys NODE_VERSION = 'v0.11.13' BASE_URL = 'https://gh-contractor-zcbenz.s3.amazonaws.com/libchromiumcontent' -LIBCHROMIUMCONTENT_COMMIT = 'dcd011c56f1e19885bac78ca58a397b0c5c25265' +LIBCHROMIUMCONTENT_COMMIT = '61d53e9631625fa8e5d5043aabea18b96ed6a950' ARCH = { 'cygwin': '32bit',