diff --git a/atom/browser/api/atom_api_tray.cc b/atom/browser/api/atom_api_tray.cc index f3dd57b738..649967a2b1 100644 --- a/atom/browser/api/atom_api_tray.cc +++ b/atom/browser/api/atom_api_tray.cc @@ -110,7 +110,7 @@ void Tray::SetContextMenu(mate::Arguments* args, Menu* menu) { void Tray::BuildPrototype(v8::Isolate* isolate, v8::Local prototype) { mate::ObjectTemplateBuilder(isolate, prototype) - .SetMethod("destroy", &Tray::Destroy) + .SetMethod("destroy", &Tray::Destroy, true) .SetMethod("setImage", &Tray::SetImage) .SetMethod("setPressedImage", &Tray::SetPressedImage) .SetMethod("setToolTip", &Tray::SetToolTip) diff --git a/atom/browser/api/atom_api_web_contents.cc b/atom/browser/api/atom_api_web_contents.cc index 480cb51c30..e2d1b31ae3 100644 --- a/atom/browser/api/atom_api_web_contents.cc +++ b/atom/browser/api/atom_api_web_contents.cc @@ -740,8 +740,8 @@ mate::ObjectTemplateBuilder WebContents::GetObjectTemplateBuilder( v8::Isolate* isolate) { if (template_.IsEmpty()) template_.Reset(isolate, mate::ObjectTemplateBuilder(isolate) - .SetMethod("destroy", &WebContents::Destroy) - .SetMethod("isAlive", &WebContents::IsAlive) + .SetMethod("destroy", &WebContents::Destroy, true) + .SetMethod("isAlive", &WebContents::IsAlive, true) .SetMethod("getId", &WebContents::GetID) .SetMethod("equal", &WebContents::Equal) .SetMethod("_loadUrl", &WebContents::LoadURL) @@ -775,7 +775,7 @@ mate::ObjectTemplateBuilder WebContents::GetObjectTemplateBuilder( .SetMethod("unselect", &WebContents::Unselect) .SetMethod("replace", &WebContents::Replace) .SetMethod("replaceMisspelling", &WebContents::ReplaceMisspelling) - .SetMethod("_send", &WebContents::SendIPCMessage) + .SetMethod("_send", &WebContents::SendIPCMessage, true) .SetMethod("setSize", &WebContents::SetSize) .SetMethod("setAllowTransparency", &WebContents::SetAllowTransparency) .SetMethod("isGuest", &WebContents::IsGuest) diff --git a/atom/browser/api/atom_api_window.cc b/atom/browser/api/atom_api_window.cc index b47e9e4f55..d5bce58911 100644 --- a/atom/browser/api/atom_api_window.cc +++ b/atom/browser/api/atom_api_window.cc @@ -481,7 +481,7 @@ v8::Local Window::DevToolsWebContents(v8::Isolate* isolate) { void Window::BuildPrototype(v8::Isolate* isolate, v8::Local prototype) { mate::ObjectTemplateBuilder(isolate, prototype) - .SetMethod("destroy", &Window::Destroy) + .SetMethod("destroy", &Window::Destroy, true) .SetMethod("close", &Window::Close) .SetMethod("isClosed", &Window::IsClosed) .SetMethod("focus", &Window::Focus) @@ -544,9 +544,9 @@ void Window::BuildPrototype(v8::Isolate* isolate, .SetMethod("showDefinitionForSelection", &Window::ShowDefinitionForSelection) #endif - .SetProperty("id", &Window::ID) - .SetProperty("webContents", &Window::WebContents) - .SetProperty("devToolsWebContents", &Window::DevToolsWebContents); + .SetProperty("id", &Window::ID, true) + .SetProperty("webContents", &Window::WebContents, true) + .SetProperty("devToolsWebContents", &Window::DevToolsWebContents, true); } } // namespace api diff --git a/atom/browser/lib/guest-window-manager.coffee b/atom/browser/lib/guest-window-manager.coffee index e26c93513c..fb961dddef 100644 --- a/atom/browser/lib/guest-window-manager.coffee +++ b/atom/browser/lib/guest-window-manager.coffee @@ -23,7 +23,7 @@ createGuest = (embedder, url, frameName, options) -> closedByEmbedder = -> embedder.send 'ATOM_SHELL_GUEST_WINDOW_MANAGER_WINDOW_CLOSED', guest.id guest.removeListener 'closed', closedByUser - guest.destroy() unless guest.isClosed() + guest.destroy() closedByUser = -> embedder.send 'ATOM_SHELL_GUEST_WINDOW_MANAGER_WINDOW_CLOSED', guest.id embedder.removeListener 'render-view-deleted', closedByEmbedder diff --git a/vendor/native_mate b/vendor/native_mate index 7b9926807d..41cd6d13c9 160000 --- a/vendor/native_mate +++ b/vendor/native_mate @@ -1 +1 @@ -Subproject commit 7b9926807d330ec173e912f28b86f843225a3286 +Subproject commit 41cd6d13c9c9be164f427864277f3cc36b69eb39