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

fix toBUFFER naming issue and cursor-changed parameter order

Browse source
This commit is contained in:
Heilig Benedek 2016-08-01 02:13:31 +02:00
parent f3b723c9fa
commit bc7c5c567c
3 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
atom/browser/api/atom_api_web_contents.cc
View file

@ -1299,9 +1299,9 @@ void WebContents::OnCursorChange(const content::WebCursor& cursor) {
if (cursor.IsCustom()) { if (cursor.IsCustom()) {
Emit("cursor-changed", CursorTypeToString(info), Emit("cursor-changed", CursorTypeToString(info),
gfx::Image::CreateFrom1xBitmap(info.custom_image), gfx::Image::CreateFrom1xBitmap(info.custom_image),
gfx::Rect(info.custom_image.width(), info.custom_image.height()), info.image_scale_factor,
info.hotspot, gfx::Size(info.custom_image.width(), info.custom_image.height()),
info.image_scale_factor); info.hotspot);
} else { } else {
Emit("cursor-changed", CursorTypeToString(info)); Emit("cursor-changed", CursorTypeToString(info));
} }

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

@ -220,7 +220,7 @@ v8::Local<v8::Value> NativeImage::ToPNG(v8::Isolate* isolate) {
static_cast<size_t>(png->size())).ToLocalChecked(); static_cast<size_t>(png->size())).ToLocalChecked();
} }
v8::Local<v8::Value> NativeImage::ToRawBuffer(v8::Isolate* isolate) { v8::Local<v8::Value> NativeImage::ToBitmap(v8::Isolate* isolate) {
const SkBitmap* bitmap = image_.ToSkBitmap(); const SkBitmap* bitmap = image_.ToSkBitmap();
SkPixelRef* ref = bitmap->pixelRef(); SkPixelRef* ref = bitmap->pixelRef();
return node::Buffer::Copy(isolate, return node::Buffer::Copy(isolate,
@ -359,7 +359,7 @@ void NativeImage::BuildPrototype(
mate::ObjectTemplateBuilder(isolate, prototype) mate::ObjectTemplateBuilder(isolate, prototype)
.SetMethod("toPNG", &NativeImage::ToPNG) .SetMethod("toPNG", &NativeImage::ToPNG)
.SetMethod("toJPEG", &NativeImage::ToJPEG) .SetMethod("toJPEG", &NativeImage::ToJPEG)
.SetMethod("toBUFFER", &NativeImage::ToRawBuffer) .SetMethod("toBitmap", &NativeImage::ToBitmap)
.SetMethod("getNativeHandle", &NativeImage::GetNativeHandle) .SetMethod("getNativeHandle", &NativeImage::GetNativeHandle)
.SetMethod("toDataURL", &NativeImage::ToDataURL) .SetMethod("toDataURL", &NativeImage::ToDataURL)
.SetMethod("isEmpty", &NativeImage::IsEmpty) .SetMethod("isEmpty", &NativeImage::IsEmpty)

2
atom/common/api/atom_api_native_image.h
View file

@ -70,7 +70,7 @@ class NativeImage : public mate::Wrappable<NativeImage> {
private: private:
v8::Local<v8::Value> ToPNG(v8::Isolate* isolate); v8::Local<v8::Value> ToPNG(v8::Isolate* isolate);
v8::Local<v8::Value> ToJPEG(v8::Isolate* isolate, int quality); v8::Local<v8::Value> ToJPEG(v8::Isolate* isolate, int quality);
v8::Local<v8::Value> ToRawBuffer(v8::Isolate* isolate); v8::Local<v8::Value> ToBitmap(v8::Isolate* isolate);
v8::Local<v8::Value> GetNativeHandle( v8::Local<v8::Value> GetNativeHandle(
v8::Isolate* isolate, v8::Isolate* isolate,
mate::Arguments* args); mate::Arguments* args);