Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(113)

Unified Diff: ui/base/clipboard/clipboard_mac.mm

Issue 2276183002: mac: Don't lose pixels when copying a retina image from the clipboard. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@temp85
Patch Set: Export ClipboardMac to fix link error. Created 4 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ui/base/clipboard/clipboard_mac.h ('k') | ui/base/clipboard/clipboard_mac_unittest.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/base/clipboard/clipboard_mac.mm
diff --git a/ui/base/clipboard/clipboard_mac.mm b/ui/base/clipboard/clipboard_mac.mm
index 202a7f9ba948a86b2dede34128ac05ce8f37ae86..b97baa16b3491052e2590d4a3ae9c4088f19d19f 100644
--- a/ui/base/clipboard/clipboard_mac.mm
+++ b/ui/base/clipboard/clipboard_mac.mm
@@ -324,12 +324,17 @@ SkBitmap ClipboardMac::ReadImage(ClipboardType type, NSPasteboard* pb) const {
} @catch (id exception) {
}
- SkBitmap bitmap;
if (image.get()) {
- bitmap = skia::NSImageToSkBitmapWithColorSpace(
- image.get(), /*is_opaque=*/ false, base::mac::GetSystemColorSpace());
+ if ([[image representations] count] == 1u) {
+ NSBitmapImageRep* rep = [[image representations] objectAtIndex:0];
Avi (use Gerrit) 2016/08/25 18:57:25 NSImageRep* rep = not NSBitmapImageRep* rep = You
erikchen 2016/08/26 17:55:33 Done.
+ return skia::NSImageRepToSkBitmapWithColorSpace(
+ rep, NSMakeSize([rep pixelsWide], [rep pixelsHigh]),
+ /*is_opaque=*/false, base::mac::GetSystemColorSpace());
+ }
+ return skia::NSImageToSkBitmapWithColorSpace(
+ image.get(), /*is_opaque=*/false, base::mac::GetSystemColorSpace());
}
- return bitmap;
+ return SkBitmap();
}
SkBitmap ClipboardMac::ReadImage(ClipboardType type) const {
« no previous file with comments | « ui/base/clipboard/clipboard_mac.h ('k') | ui/base/clipboard/clipboard_mac_unittest.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698