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

Add GetScaleFactorFromOptions helper

Browse source
This commit is contained in:
Kevin Sawicki 2017-03-06 16:29:39 -08:00
parent 6d5fbe6be2
commit 8852b128ec
1 changed files with 13 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -76,6 +76,15 @@ float GetScaleFactorFromPath(const base::FilePath& path) {
return 1.0f; return 1.0f;
} }
// Get the scale factor from options object at the first argument
float GetScaleFactorFromOptions(mate::Arguments* args) {
float scale_factor = 1.0f;
mate::Dictionary options;
if (args->GetNext(&options))
options.Get("scaleFactor", &scale_factor);
return scale_factor;
}
bool AddImageSkiaRep(gfx::ImageSkia* image, bool AddImageSkiaRep(gfx::ImageSkia* image,
const unsigned char* data, const unsigned char* data,
size_t size, size_t size,
@ -231,10 +240,7 @@ HICON NativeImage::GetHICON(int size) {
#endif #endif
v8::Local<v8::Value> NativeImage::ToPNG(mate::Arguments* args) { v8::Local<v8::Value> NativeImage::ToPNG(mate::Arguments* args) {
float scale_factor = 1.0f; float scale_factor = GetScaleFactorFromOptions(args);
mate::Dictionary options;
if (args->GetNext(&options))
options.Get("scaleFactor", &scale_factor);
if (scale_factor == 1.0f) { if (scale_factor == 1.0f) {
// Use raw 1x PNG bytes when available // Use raw 1x PNG bytes when available
@ -257,10 +263,7 @@ v8::Local<v8::Value> NativeImage::ToPNG(mate::Arguments* args) {
} }
v8::Local<v8::Value> NativeImage::ToBitmap(mate::Arguments* args) { v8::Local<v8::Value> NativeImage::ToBitmap(mate::Arguments* args) {
float scale_factor = 1.0f; float scale_factor = GetScaleFactorFromOptions(args);
mate::Dictionary options;
if (args->GetNext(&options))
options.Get("scaleFactor", &scale_factor);
const SkBitmap bitmap = const SkBitmap bitmap =
image_.AsImageSkia().GetRepresentation(scale_factor).sk_bitmap(); image_.AsImageSkia().GetRepresentation(scale_factor).sk_bitmap();
@ -282,10 +285,7 @@ v8::Local<v8::Value> NativeImage::ToJPEG(v8::Isolate* isolate, int quality) {
} }
std::string NativeImage::ToDataURL(mate::Arguments* args) { std::string NativeImage::ToDataURL(mate::Arguments* args) {
float scale_factor = 1.0f; float scale_factor = GetScaleFactorFromOptions(args);
mate::Dictionary options;
if (args->GetNext(&options))
options.Get("scaleFactor", &scale_factor);
if (scale_factor == 1.0f) { if (scale_factor == 1.0f) {
// Use raw 1x PNG bytes when available // Use raw 1x PNG bytes when available
@ -299,10 +299,7 @@ std::string NativeImage::ToDataURL(mate::Arguments* args) {
} }
v8::Local<v8::Value> NativeImage::GetBitmap(mate::Arguments* args) { v8::Local<v8::Value> NativeImage::GetBitmap(mate::Arguments* args) {
float scale_factor = 1.0f; float scale_factor = GetScaleFactorFromOptions(args);
mate::Dictionary options;
if (args->GetNext(&options))
options.Get("scaleFactor", &scale_factor);
const SkBitmap bitmap = const SkBitmap bitmap =
image_.AsImageSkia().GetRepresentation(scale_factor).sk_bitmap(); image_.AsImageSkia().GetRepresentation(scale_factor).sk_bitmap();