GetConstructor now returns FunctionTemplate

diff --git a/atom/browser/api/atom_api_menu.cc b/atom/browser/api/atom_api_menu.cc
index 3c8cb0e..e705f61 100644 (file)
--- a/atom/browser/api/atom_api_menu.cc
+++ b/atom/browser/api/atom_api_menu.cc
@@ -193,7 +193,7 @@ void Initialize(v8::Local<v8::Object> exports, v8::Local<v8::Value> unused,
   Menu::SetConstructor(isolate, "Menu", base::Bind(&Menu::New));
 
   mate::Dictionary dict(isolate, exports);
-  dict.Set("Menu", Menu::GetConstructor(isolate));
+  dict.Set("Menu", Menu::GetConstructor(isolate)->GetFunction());
 #if defined(OS_MACOSX)
   dict.SetMethod("setApplicationMenu", &Menu::SetApplicationMenu);
   dict.SetMethod("sendActionToFirstResponder",

diff --git a/atom/browser/api/atom_api_tray.cc b/atom/browser/api/atom_api_tray.cc
index a987030..7892c7b 100644 (file)
--- a/atom/browser/api/atom_api_tray.cc
+++ b/atom/browser/api/atom_api_tray.cc
@@ -230,7 +230,7 @@ void Initialize(v8::Local<v8::Object> exports, v8::Local<v8::Value> unused,
   Tray::SetConstructor(isolate, "Tray", base::Bind(&Tray::New));
 
   mate::Dictionary dict(isolate, exports);
-  dict.Set("Tray", Tray::GetConstructor(isolate));
+  dict.Set("Tray", Tray::GetConstructor(isolate)->GetFunction());
 }
 
 }  // namespace

diff --git a/atom/browser/api/atom_api_window.cc b/atom/browser/api/atom_api_window.cc
index 8433730..70ecf8f 100644 (file)
--- a/atom/browser/api/atom_api_window.cc
+++ b/atom/browser/api/atom_api_window.cc
@@ -871,7 +871,8 @@ void Initialize(v8::Local<v8::Object> exports, v8::Local<v8::Value> unused,
   v8::Isolate* isolate = context->GetIsolate();
   Window::SetConstructor(isolate, "BrowserWindow", base::Bind(&Window::New));
 
-  mate::Dictionary browser_window(isolate, Window::GetConstructor(isolate));
+  mate::Dictionary browser_window(
+      isolate, Window::GetConstructor(isolate)->GetFunction());
   browser_window.SetMethod("fromId",
                            &mate::TrackableObject<Window>::FromWeakMapID);
   browser_window.SetMethod("getAllWindows",

diff --git a/vendor/native_mate b/vendor/native_mate
index 2d26eeb..3a7a6ef 160000 (submodule)
--- a/vendor/native_mate
+++ b/vendor/native_mate
@@ -1 +1 @@
-Subproject commit 2d26eebca8d6e0e8fdfdf68197699ae78018fbda
+Subproject commit 3a7a6efffb4b3cd68967466cb1cab337509e3b07