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

Remove hasRepresentation and just use 1x png result

Browse source
This commit is contained in:
Kevin Sawicki 2017-03-06 14:55:57 -08:00
parent c11cdf321b
commit e4ead6d018
3 changed files with 5 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -231,8 +231,8 @@ HICON NativeImage::GetHICON(int size) {
#endif #endif
v8::Local<v8::Value> NativeImage::ToPNG(v8::Isolate* isolate) { v8::Local<v8::Value> NativeImage::ToPNG(v8::Isolate* isolate) {
if (HasRepresentation(1.0)) { scoped_refptr<base::RefCountedMemory> png = image_.As1xPNGBytes();
scoped_refptr<base::RefCountedMemory> png = image_.As1xPNGBytes(); if (IsEmpty() || png->size() > 0) {
const char* data = reinterpret_cast<const char*>(png->front()); const char* data = reinterpret_cast<const char*>(png->front());
const size_t length = static_cast<size_t>(png->size()); const size_t length = static_cast<size_t>(png->size());
return node::Buffer::Copy(isolate, data, length).ToLocalChecked(); return node::Buffer::Copy(isolate, data, length).ToLocalChecked();
@ -264,12 +264,11 @@ v8::Local<v8::Value> NativeImage::ToJPEG(v8::Isolate* isolate, int quality) {
} }
std::string NativeImage::ToDataURL() { std::string NativeImage::ToDataURL() {
if (HasRepresentation(1.0)) { scoped_refptr<base::RefCountedMemory> png = image_.As1xPNGBytes();
scoped_refptr<base::RefCountedMemory> png = image_.As1xPNGBytes(); if (IsEmpty() || png->size() > 0)
return webui::GetPngDataUrl(png->front(), png->size()); return webui::GetPngDataUrl(png->front(), png->size());
} else { else
return webui::GetBitmapDataUrl(image_.AsBitmap()); return webui::GetBitmapDataUrl(image_.AsBitmap());
}
} }
v8::Local<v8::Value> NativeImage::GetBitmap(v8::Isolate* isolate) { v8::Local<v8::Value> NativeImage::GetBitmap(v8::Isolate* isolate) {
@ -304,10 +303,6 @@ bool NativeImage::IsEmpty() {
return image_.IsEmpty(); return image_.IsEmpty();
} }
bool NativeImage::HasRepresentation(float scale_factor) {
return image_.AsImageSkia().HasRepresentation(scale_factor);
}
gfx::Size NativeImage::GetSize() { gfx::Size NativeImage::GetSize() {
return image_.Size(); return image_.Size();
} }
@ -479,7 +474,6 @@ void NativeImage::BuildPrototype(
.SetMethod("resize", &NativeImage::Resize) .SetMethod("resize", &NativeImage::Resize)
.SetMethod("crop", &NativeImage::Crop) .SetMethod("crop", &NativeImage::Crop)
.SetMethod("getAspectRatio", &NativeImage::GetAspectRatio) .SetMethod("getAspectRatio", &NativeImage::GetAspectRatio)
.SetMethod("hasRepresentation", &NativeImage::HasRepresentation)
// TODO(kevinsawicki): Remove in 2.0, deprecate before then with warnings // TODO(kevinsawicki): Remove in 2.0, deprecate before then with warnings
.SetMethod("toPng", &NativeImage::ToPNG) .SetMethod("toPng", &NativeImage::ToPNG)
.SetMethod("toJpeg", &NativeImage::ToJPEG); .SetMethod("toJpeg", &NativeImage::ToJPEG);

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

@ -83,7 +83,6 @@ class NativeImage : public mate::Wrappable<NativeImage> {
const gfx::Rect& rect); const gfx::Rect& rect);
std::string ToDataURL(); std::string ToDataURL();
bool IsEmpty(); bool IsEmpty();
bool HasRepresentation(float scale_factor);
gfx::Size GetSize(); gfx::Size GetSize();
float GetAspectRatio(); float GetAspectRatio();

7
spec/api-native-image-spec.js
View file

@ -9,7 +9,6 @@ describe('nativeImage module', () => {
it('returns an empty image', () => { it('returns an empty image', () => {
const empty = nativeImage.createEmpty() const empty = nativeImage.createEmpty()
assert.equal(empty.isEmpty(), true) assert.equal(empty.isEmpty(), true)
assert.equal(empty.hasRepresentation(1.0), false)
assert.equal(empty.getAspectRatio(), 1) assert.equal(empty.getAspectRatio(), 1)
assert.equal(empty.toDataURL(), 'data:image/png;base64,') assert.equal(empty.toDataURL(), 'data:image/png;base64,')
assert.deepEqual(empty.getSize(), {width: 0, height: 0}) assert.deepEqual(empty.getSize(), {width: 0, height: 0})
@ -94,12 +93,9 @@ describe('nativeImage module', () => {
scaleFactor: 2.0 scaleFactor: 2.0
}) })
assert.deepEqual(imageB.getSize(), {width: 269, height: 95}) assert.deepEqual(imageB.getSize(), {width: 269, height: 95})
assert.equal(imageB.hasRepresentation(1.0), false)
assert.equal(imageB.hasRepresentation(2.0), true)
const imageC = nativeImage.createFromDataURL(imageB.toDataURL()) const imageC = nativeImage.createFromDataURL(imageB.toDataURL())
assert.deepEqual(imageC.getSize(), {width: 538, height: 190}) assert.deepEqual(imageC.getSize(), {width: 538, height: 190})
assert.equal(imageC.hasRepresentation(1.0), false)
assert(imageB.toBitmap().equals(imageC.toBitmap())) assert(imageB.toBitmap().equals(imageC.toBitmap()))
}) })
}) })
@ -113,12 +109,9 @@ describe('nativeImage module', () => {
scaleFactor: 2.0 scaleFactor: 2.0
}) })
assert.deepEqual(imageB.getSize(), {width: 269, height: 95}) assert.deepEqual(imageB.getSize(), {width: 269, height: 95})
assert.equal(imageB.hasRepresentation(1.0), false)
assert.equal(imageB.hasRepresentation(2.0), true)
const imageC = nativeImage.createFromBuffer(imageB.toPNG()) const imageC = nativeImage.createFromBuffer(imageB.toPNG())
assert.deepEqual(imageC.getSize(), {width: 538, height: 190}) assert.deepEqual(imageC.getSize(), {width: 538, height: 190})
assert.equal(imageC.hasRepresentation(1.0), true)
assert(imageB.toBitmap().equals(imageC.toBitmap())) assert(imageB.toBitmap().equals(imageC.toBitmap()))
}) })
}) })