From 541b8555124c67344e7829064e5207f4da320ae6 Mon Sep 17 00:00:00 2001 From: Cheng Zhao Date: Tue, 27 May 2014 08:47:53 +0800 Subject: [PATCH] Move the ability of calling _init to native_mate. --- atom/browser/api/atom_api_window.cc | 8 +------- vendor/native_mate | 2 +- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/atom/browser/api/atom_api_window.cc b/atom/browser/api/atom_api_window.cc index 869ce7571fab..c30e299f4fb8 100644 --- a/atom/browser/api/atom_api_window.cc +++ b/atom/browser/api/atom_api_window.cc @@ -111,13 +111,7 @@ void Window::OnRendererResponsive() { mate::Wrappable* Window::New(mate::Arguments* args, const base::DictionaryValue& options) { scoped_ptr copied_options(options.DeepCopy()); - Window* window = new Window(copied_options.get()); - window->Wrap(args->isolate(), args->GetThis()); - - // Give js code a chance to do initialization. - node::MakeCallback(args->GetThis(), "_init", 0, NULL); - - return window; + return new Window(copied_options.get()); } void Window::Destroy() { diff --git a/vendor/native_mate b/vendor/native_mate index f033e23ea315..c79aecf64de2 160000 --- a/vendor/native_mate +++ b/vendor/native_mate @@ -1 +1 @@ -Subproject commit f033e23ea3156db611e801af96eabd81d51ba85a +Subproject commit c79aecf64de260dd239c6aed8397d3e152d7589d