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

Do not use deprecated deepCopyTo

Browse source
This commit is contained in:
Vladimir Vainer 2017-07-16 06:33:37 +03:00
parent 5f2dd2ef6c
commit 517184b89b
1 changed files with 40 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

45
atom/common/api/atom_api_clipboard.cc
View file

@ -165,14 +165,49 @@ gfx::Image Clipboard::ReadImage(mate::Arguments* args) {
return gfx::Image::CreateFrom1xBitmap(bitmap); return gfx::Image::CreateFrom1xBitmap(bitmap);
} }
// TODO(ferreus): Replace with sk_tools_utils::copy_to when it's available
bool copy_to(SkBitmap* dst, SkColorType dstColorType, const SkBitmap& src) {
SkPixmap srcPM;
if (!src.peekPixels(&srcPM)) {
return false;
}
SkBitmap tmpDst;
SkImageInfo dstInfo = srcPM.info().makeColorType(dstColorType);
if (!tmpDst.setInfo(dstInfo)) {
return false;
}
// allocate colortable if srcConfig == kIndex8_Config
sk_sp<SkColorTable> ctable = nullptr;
if (dstColorType == kIndex_8_SkColorType) {
if (src.colorType() != kIndex_8_SkColorType) {
return false;
}
ctable = sk_ref_sp(srcPM.ctable());
}
if (!tmpDst.tryAllocPixels(ctable.get())) {
return false;
}
SkPixmap dstPM;
if (!tmpDst.peekPixels(&dstPM)) {
return false;
}
if (!srcPM.readPixels(dstPM)) {
return false;
}
dst->swap(tmpDst);
return true;
}
void Clipboard::WriteImage(const gfx::Image& image, mate::Arguments* args) { void Clipboard::WriteImage(const gfx::Image& image, mate::Arguments* args) {
ui::ScopedClipboardWriter writer(GetClipboardType(args)); ui::ScopedClipboardWriter writer(GetClipboardType(args));
SkBitmap bmp;
if (image.AsBitmap().deepCopyTo(&bmp)) { SkBitmap dst;
writer.WriteImage(bmp); SkBitmap src = image.AsBitmap();
} else { src.lockPixels();
writer.WriteImage(image.AsBitmap()); if (copy_to(&dst, src.colorType(), src)) {
writer.WriteImage(dst);
} }
src.unlockPixels();
} }
#if !defined(OS_MACOSX) #if !defined(OS_MACOSX)