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

Fix node::Buffer API changes.

Browse source
This commit is contained in:
Haojian Wu 2015-08-04 16:50:33 +08:00 • committed by Cheng Zhao
parent 46c7ba734b
commit 11ffb9dfb6
2 changed files with 9 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

13
atom/common/api/atom_api_native_image.cc
View file

@ -148,17 +148,18 @@ mate::ObjectTemplateBuilder NativeImage::GetObjectTemplateBuilder(
v8::Local<v8::Value> NativeImage::ToPNG(v8::Isolate* isolate) { v8::Local<v8::Value> NativeImage::ToPNG(v8::Isolate* isolate) {
scoped_refptr<base::RefCountedMemory> png = image_.As1xPNGBytes(); scoped_refptr<base::RefCountedMemory> png = image_.As1xPNGBytes();
return node::Buffer::New(isolate, return node::Buffer::Copy(isolate,
reinterpret_cast<const char*>(png->front()), reinterpret_cast<const char*>(png->front()),
png->size()); static_cast<size_t>(png->size())).ToLocalChecked();
} }
v8::Local<v8::Value> NativeImage::ToJPEG(v8::Isolate* isolate, int quality) { v8::Local<v8::Value> NativeImage::ToJPEG(v8::Isolate* isolate, int quality) {
std::vector<unsigned char> output; std::vector<unsigned char> output;
gfx::JPEG1xEncodedDataFromImage(image_, quality, &output); gfx::JPEG1xEncodedDataFromImage(image_, quality, &output);
return node::Buffer::New(isolate, return node::Buffer::Copy(
reinterpret_cast<const char*>(&output.front()), isolate,
output.size()); reinterpret_cast<const char*>(&output.front()),
static_cast<size_t>(output.size())).ToLocalChecked();
} }
std::string NativeImage::ToDataURL() { std::string NativeImage::ToDataURL() {

4
chromium_src/chrome/browser/printing/print_preview_message_handler.cc
View file

@ -125,8 +125,8 @@ void PrintPreviewMessageHandler::RunPrintToPDFCallback(
v8::Locker locker(isolate); v8::Locker locker(isolate);
v8::HandleScope handle_scope(isolate); v8::HandleScope handle_scope(isolate);
if (data) { if (data) {
v8::Local<v8::Value> buffer = node::Buffer::Use(isolate, v8::Local<v8::Value> buffer = node::Buffer::New(isolate,
data, static_cast<size_t>(data_size)); data, static_cast<size_t>(data_size)).ToLocalChecked();
print_to_pdf_callback_map_[request_id].Run(v8::Null(isolate), buffer); print_to_pdf_callback_map_[request_id].Run(v8::Null(isolate), buffer);
} else { } else {
v8::Local<v8::String> error_message = v8::String::NewFromUtf8(isolate, v8::Local<v8::String> error_message = v8::String::NewFromUtf8(isolate,