Fix reading PDF images from NSPasteboard.

ui/base/clipboard/clipboard_mac.mm

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ui/base/clipboard/clipboard_mac.h"
 
 #import <Cocoa/Cocoa.h>
 #include <stdint.h>
 
 #include <limits>
@@ skipping 306 matching lines @@
         image.reset([[NSImage alloc]
             initWithContentsOfURL:[NSURL fileURLWithPath:[paths lastObject]]]);
       }
     } else {
       if (pb)
         image.reset([[NSImage alloc] initWithPasteboard:pb]);
     }
   } @catch (id exception) {
   }
 
-  if (image.get()) {
-    if ([[image representations] count] == 1u) {
-      NSImageRep* rep = [[image representations] objectAtIndex:0];
+  if (!image)
+    return SkBitmap();
+  if ([[image representations] count] == 0u)
+    return SkBitmap();
+
+  if ([[image representations] count] == 1u) {
+    NSImageRep* rep = [[image representations] objectAtIndex:0];
+    NSInteger width = [rep pixelsWide];
+    NSInteger height = [rep pixelsHigh];
+    if (width != 0 && height != 0) {
       return skia::NSImageRepToSkBitmapWithColorSpace(
-          rep, NSMakeSize([rep pixelsWide], [rep pixelsHigh]),
-          /*is_opaque=*/false, base::mac::GetSystemColorSpace());
+          rep, NSMakeSize(width, height), /*is_opaque=*/false,
+          base::mac::GetSystemColorSpace());
     }
-    return skia::NSImageToSkBitmapWithColorSpace(
-        image.get(), /*is_opaque=*/false, base::mac::GetSystemColorSpace());
   }
-  return SkBitmap();
+  return skia::NSImageToSkBitmapWithColorSpace(
+      image.get(), /*is_opaque=*/false, base::mac::GetSystemColorSpace());

[Avi (use Gerrit), 2016/12/22 03:22:03]

Wait... why don't we always go this path? Why do we extract out the image rep
for that other call?

[erikchen, 2016/12/22 04:51:49]

this loses pixels from retina images:
https://codereview.chromium.org/2276183002

[Avi (use Gerrit), 2016/12/22 05:42:25]

Can you mention this in a comment?

[erikchen, 2016/12/22 18:19:21]

Done.

 }
 
 SkBitmap ClipboardMac::ReadImage(ClipboardType type) const {
   return ReadImage(type, GetPasteboard());
 }
 
 void ClipboardMac::ReadCustomData(ClipboardType clipboard_type,
                                   const base::string16& type,
                                   base::string16* result) const {
   DCHECK(CalledOnValidThread());
@@ skipping 115 matching lines @@
 // Write an extra flavor that signifies WebKit was the last to modify the
 // pasteboard. This flavor has no data.
 void ClipboardMac::WriteWebSmartPaste() {
   NSPasteboard* pb = GetPasteboard();
   NSString* format = GetWebKitSmartPasteFormatType().ToNSString();
   [pb addTypes:[NSArray arrayWithObject:format] owner:nil];
   [pb setData:nil forType:format];
 }
 
 }  // namespace ui