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

Move the ability of calling _init to native_mate.

Browse source
This commit is contained in:
Cheng Zhao 2014-05-27 08:47:53 +08:00
parent 8b42990bb3
commit 541b855512
2 changed files with 2 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

8
atom/browser/api/atom_api_window.cc
View file

@ -111,13 +111,7 @@ void Window::OnRendererResponsive() {
mate::Wrappable* Window::New(mate::Arguments* args, mate::Wrappable* Window::New(mate::Arguments* args,
const base::DictionaryValue& options) { const base::DictionaryValue& options) {
scoped_ptr<base::DictionaryValue> copied_options(options.DeepCopy()); scoped_ptr<base::DictionaryValue> copied_options(options.DeepCopy());
Window* window = new Window(copied_options.get()); return 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;
} }
void Window::Destroy() { void Window::Destroy() {

2
vendor/native_mate vendored

@ -1 +1 @@
Subproject commit f033e23ea3156db611e801af96eabd81d51ba85a Subproject commit c79aecf64de260dd239c6aed8397d3e152d7589d