GrabWindowSnapshotTest.TestGrabWindowSnapshot fails in HighDPI

chrome/browser/ui/window_snapshot/window_snapshot_mac_unittest.mm

Index: chrome/browser/ui/window_snapshot/window_snapshot_mac_unittest.mm
diff --git a/chrome/browser/ui/window_snapshot/window_snapshot_mac_unittest.mm b/chrome/browser/ui/window_snapshot/window_snapshot_mac_unittest.mm
index 638aecfccca9d0f51968e1f6e42b4c2748ef2813..4ebf31b0b83e9c749f6d1442442eed4773965bdf 100644
--- a/chrome/browser/ui/window_snapshot/window_snapshot_mac_unittest.mm
+++ b/chrome/browser/ui/window_snapshot/window_snapshot_mac_unittest.mm
@@ -11,6 +11,15 @@
 #include "testing/platform_test.h"
 #include "ui/gfx/rect.h"
 
+#if !defined(MAC_OS_X_VERSION_10_7) || \
+    MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_7
+
+@interface NSWindow (LionAPI)
+- (CGFloat)backingScaleFactor;
+@end
+
+#endif  // 10.7
+
 namespace chrome {
 namespace {
 
@@ -39,8 +48,11 @@ TEST_F(GrabWindowSnapshotTest, TestGrabWindowSnapshot) {
                              length:png_representation->size()]);
   NSBitmapImageRep* rep = [NSBitmapImageRep imageRepWithData:image_data.get()];
   EXPECT_TRUE([rep isKindOfClass:[NSBitmapImageRep class]]);
-  EXPECT_TRUE(CGImageGetWidth([rep CGImage]) == 400);
-  NSColor* color = [rep colorAtX:200 y:200];
+  CGFloat scaleFactor = 1.0f;
+  if ([window respondsToSelector:@selector(backingScaleFactor)])
+    scaleFactor = [window backingScaleFactor];
+  EXPECT_EQ(400UL * scaleFactor, CGImageGetWidth([rep CGImage]));

[Nico, 2012/09/21 03:37:44]

Do you need the UL? It's multiplied by a float, the result's float too.

[dhollowa, 2012/09/21 04:06:51]

Ah yes, I'd converted to UL prior to adding the scale factor fix.  Done.

On 2012/09/21 03:37:44, Nico wrote:

+  NSColor* color = [rep colorAtX:200 * scaleFactor y:200 * scaleFactor];
   CGFloat red = 0, green = 0, blue = 0, alpha = 0;
   [color getRed:&red green:&green blue:&blue alpha:&alpha];
   EXPECT_GE(red + green + blue, 3.0);