Return NativeImage in BrowserWindow.capturePage

zcbenz · zcbenz · commit da407200d2b2 · 2015-02-12T13:45:50.000+08:00
diff --git a/atom/browser/api/atom_api_window.cc b/atom/browser/api/atom_api_window.cc
@@ -52,15 +52,11 @@ namespace {
 
 void OnCapturePageDone(
     v8::Isolate* isolate,
-    const base::Callback<void(v8::Handle<v8::Value>)>& callback,
+    const base::Callback<void(const gfx::Image&)>& callback,
     const std::vector<unsigned char>& data) {
   v8::Locker locker(isolate);
   v8::HandleScope handle_scope(isolate);
-
-  v8::Local<v8::Value> buffer = node::Buffer::New(
-      reinterpret_cast<const char*>(data.data()),
-      data.size());
-  callback.Run(buffer);
+  callback.Run(gfx::Image::CreateFrom1xPNGBytes(&data.front(), data.size()));
 }
 
 }  // namespace
@@ -374,7 +370,7 @@ bool Window::IsDocumentEdited() {
 
 void Window::CapturePage(mate::Arguments* args) {
   gfx::Rect rect;
-  base::Callback<void(v8::Handle<v8::Value>)> callback;
+  base::Callback<void(const gfx::Image&)> callback;
 
   if (!(args->Length() == 1 && args->GetNext(&callback)) &&
       !(args->Length() == 2 && args->GetNext(&rect)
diff --git a/vendor/native_mate b/vendor/native_mate
@@ -1 +1 @@
-Subproject commit 3387f33a8e7b4107f4268dec2a72a3fa943d706c
+Subproject commit 8d537ee2b6da29c1aa38928590d4c56700e1c69b
