diff --git a/atom/browser/api/atom_api_window.cc b/atom/browser/api/atom_api_window.cc index 81a2d37305ff..4dd7803178e3 100644 --- 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)>& callback, + const base::Callback& callback, const std::vector& data) { v8::Locker locker(isolate); v8::HandleScope handle_scope(isolate); - - v8::Local buffer = node::Buffer::New( - reinterpret_cast(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)> callback; + base::Callback callback; if (!(args->Length() == 1 && args->GetNext(&callback)) && !(args->Length() == 2 && args->GetNext(&rect) diff --git a/vendor/native_mate b/vendor/native_mate index 3387f33a8e7b..8d537ee2b6da 160000 --- a/vendor/native_mate +++ b/vendor/native_mate @@ -1 +1 @@ -Subproject commit 3387f33a8e7b4107f4268dec2a72a3fa943d706c +Subproject commit 8d537ee2b6da29c1aa38928590d4c56700e1c69b