0fe6767d6b
* refactor: convert Menu and globalShortcut to gin * refactor: convert api::Cookies to gin * refactor: convert View and WebContentsView to gin * refactor: convert WebContents related classes to gin * refactor: convert powerMonitor to gin * refactor: prepare for header change * refactor: remove last uses of mate::EventEmitter * refactor: remove mate::EventEmitter * refactor: move trackable_object to gin_helper * fix: custom converter should not use Handle * fix: no more need to check if icon is empty It was a bug that the Handle<NativeImage> can be non-empty when the image file does not exist. The bug was caused by the converter code writing out the image even when the convertion fails. The bug was work-arounded by adding an additional check, but since the original bug had been fixed, the additional check is no longer needed. * fix: should always set frameId even when callback is null * fix: do not mix gin/mate handles for NativeImage
44 lines
1.3 KiB
C++
44 lines
1.3 KiB
C++
// Copyright (c) 2019 GitHub, Inc.
|
|
// Use of this source code is governed by the MIT license that can be
|
|
// found in the LICENSE file.
|
|
|
|
#include "shell/common/gin_converters/image_converter.h"
|
|
|
|
#include "shell/common/api/atom_api_native_image.h"
|
|
#include "shell/common/gin_converters/file_path_converter.h"
|
|
#include "ui/gfx/image/image_skia.h"
|
|
|
|
namespace gin {
|
|
|
|
bool Converter<gfx::ImageSkia>::FromV8(v8::Isolate* isolate,
|
|
v8::Local<v8::Value> val,
|
|
gfx::ImageSkia* out) {
|
|
gfx::Image image;
|
|
if (!ConvertFromV8(isolate, val, &image))
|
|
return false;
|
|
|
|
*out = image.AsImageSkia();
|
|
return true;
|
|
}
|
|
|
|
bool Converter<gfx::Image>::FromV8(v8::Isolate* isolate,
|
|
v8::Local<v8::Value> val,
|
|
gfx::Image* out) {
|
|
if (val->IsNull())
|
|
return true;
|
|
|
|
gin::Handle<electron::api::NativeImage> native_image;
|
|
if (!gin::ConvertFromV8(isolate, val, &native_image))
|
|
return false;
|
|
|
|
*out = native_image->image();
|
|
return true;
|
|
}
|
|
|
|
v8::Local<v8::Value> Converter<gfx::Image>::ToV8(v8::Isolate* isolate,
|
|
const gfx::Image& val) {
|
|
return gin::ConvertToV8(isolate,
|
|
electron::api::NativeImage::Create(isolate, val));
|
|
}
|
|
|
|
} // namespace gin
|