mac: Handle hidpi cursors.

webkit/glue/webcursor_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 "webkit/glue/webcursor.h"
 
 #import <AppKit/AppKit.h>
 
 #include "base/logging.h"
 #include "base/mac/mac_util.h"
 #include "base/mac/scoped_cftyperef.h"
 #include "base/memory/scoped_nsobject.h"
 #include "grit/webkit_chromium_resources.h"
 #include "skia/ext/skia_utils_mac.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebCursorInfo.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebImage.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebSize.h"
 #include "ui/base/resource/resource_bundle.h"
+#include "ui/gfx/point_conversions.h"
+#include "ui/gfx/size_conversions.h"
 
 
 using WebKit::WebCursorInfo;
 using WebKit::WebImage;
 using WebKit::WebSize;
 
 // Declare symbols that are part of the 10.7 SDK.
 #if !defined(MAC_OS_X_VERSION_10_7) || \
     MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_7
 
@@ skipping 139 matching lines @@
                             8,
                             size.width()*4,
                             cg_color.get(),
                             kCGImageAlphaPremultipliedLast |
                             kCGBitmapByteOrder32Big));
   return CGBitmapContextCreateImage(context.get());
 }
 
 NSCursor* CreateCustomCursor(const std::vector<char>& custom_data,
                              const gfx::Size& custom_size,
+                             float custom_scale,
                              const gfx::Point& hotspot) {
   // If the data is missing, leave the backing transparent.
   void* data = NULL;
   size_t data_size = 0;
   if (!custom_data.empty()) {
     // This is safe since we're not going to draw into the context we're
     // creating.
     data = const_cast<char*>(&custom_data[0]);
     data_size = custom_data.size();
   }
 
   // If the size is empty, use a 1x1 transparent image.
   gfx::Size size = custom_size;
   if (size.IsEmpty()) {
     size.SetSize(1, 1);
     data = NULL;
   }
 
   SkBitmap bitmap;
   bitmap.setConfig(SkBitmap::kARGB_8888_Config, size.width(), size.height());
   bitmap.allocPixels();
   if (data)
     memcpy(bitmap.getAddr32(0, 0), data, data_size);
   else
     bitmap.eraseARGB(0, 0, 0, 0);
+
+  // Convert from pixels to view units.
+  if (custom_scale == 0)
+    custom_scale = 1;
+  NSSize dip_size = NSSizeFromCGSize(gfx::ToFlooredSize(
+      gfx::ScaleSize(custom_size, 1 / custom_scale)).ToCGSize());
+  NSPoint dip_hotspot = NSPointFromCGPoint(gfx::ToFlooredPoint(
+      gfx::ScalePoint(hotspot, 1 / custom_scale)).ToCGPoint());
+
   NSImage* cursor_image = gfx::SkBitmapToNSImage(bitmap);
+  [cursor_image setSize:dip_size];
 
   NSCursor* cursor = [[NSCursor alloc] initWithImage:cursor_image
-                                             hotSpot:NSMakePoint(hotspot.x(),
-                                                                 hotspot.y())];
+                                             hotSpot:dip_hotspot];
 
   return [cursor autorelease];
 }
 
 }  // namespace
 
 // Match Safari's cursor choices; see platform/mac/CursorMac.mm .
 gfx::NativeCursor WebCursor::GetNativeCursor() {
   switch (type_) {
     case WebCursorInfo::TypePointer:
@@ skipping 72 matching lines @@
     case WebCursorInfo::TypeVerticalText:
       // IBeamCursorForVerticalLayout is >= 10.7.
       if ([NSCursor respondsToSelector:@selector(IBeamCursorForVerticalLayout)])
         return [NSCursor IBeamCursorForVerticalLayout];
       else
         return LoadCursor(IDR_VERTICALTEXT_CURSOR, 7, 7);
     case WebCursorInfo::TypeCell:
       return GetCoreCursorWithFallback(kCellCursor,
                                        IDR_CELL_CURSOR, 7, 7);
     case WebCursorInfo::TypeContextMenu:
-      // contextualMenuCursor is >= 10.6.
-      if ([NSCursor respondsToSelector:@selector(contextualMenuCursor)])
-        return [NSCursor contextualMenuCursor];
-      else
-        return LoadCursor(IDR_CONTEXTMENU_CURSOR, 3, 2);

[Avi (use Gerrit), 2012/12/14 21:46:26]

Are we dropping the bundling of the bitmaps we no longer need?

[Nico, 2012/12/14 21:49:37]

Good question! It looks like IDR_CONTEXTMENU_CURSOR was only used here, so it
can be removed. However, it's defined in webkit, so I'll delete it there once
this CL here has landed.

+      return [NSCursor contextualMenuCursor];
     case WebCursorInfo::TypeAlias:
       return GetCoreCursorWithFallback(kMakeAliasCursor,
                                        IDR_ALIAS_CURSOR, 11, 3);
     case WebCursorInfo::TypeProgress:
       return GetCoreCursorWithFallback(kBusyButClickableCursor,
                                        IDR_PROGRESS_CURSOR, 3, 2);
     case WebCursorInfo::TypeNoDrop:
     case WebCursorInfo::TypeNotAllowed:
-      // Docs say that operationNotAllowedCursor is >= 10.6, and it's not in the
-      // 10.5 SDK, but later SDKs note that it really is available on 10.5.
       return [NSCursor operationNotAllowedCursor];
     case WebCursorInfo::TypeCopy:
-      // dragCopyCursor is >= 10.6.
-      if ([NSCursor respondsToSelector:@selector(dragCopyCursor)])
-        return [NSCursor dragCopyCursor];
-      else
-        return LoadCursor(IDR_COPY_CURSOR, 3, 2);

[Avi (use Gerrit), 2012/12/14 21:52:15]

And IDR_COPY_CURSOR too.

+      return [NSCursor dragCopyCursor];
     case WebCursorInfo::TypeNone:
       return LoadCursor(IDR_NONE_CURSOR, 7, 7);
     case WebCursorInfo::TypeZoomIn:
       return GetCoreCursorWithFallback(kZoomInCursor,
                                        IDR_ZOOMIN_CURSOR, 7, 7);
     case WebCursorInfo::TypeZoomOut:
       return GetCoreCursorWithFallback(kZoomOutCursor,
                                        IDR_ZOOMOUT_CURSOR, 7, 7);
     case WebCursorInfo::TypeGrab:
       return [NSCursor openHandCursor];
     case WebCursorInfo::TypeGrabbing:
       return [NSCursor closedHandCursor];
     case WebCursorInfo::TypeCustom:
-      return CreateCustomCursor(custom_data_, custom_size_, hotspot_);
+      return CreateCustomCursor(
+          custom_data_, custom_size_, custom_scale_, hotspot_);
   }
   NOTREACHED();
   return nil;
 }
 
 void WebCursor::InitFromNSCursor(NSCursor* cursor) {
   WebKit::WebCursorInfo cursor_info;
 
   if ([cursor isEqual:[NSCursor arrowCursor]]) {
     cursor_info.type = WebCursorInfo::TypePointer;
@@ skipping 14 matching lines @@
   } else if ([cursor isEqual:[NSCursor resizeDownCursor]]) {
     cursor_info.type = WebCursorInfo::TypeSouthResize;
   } else if ([cursor isEqual:[NSCursor resizeUpDownCursor]]) {
     cursor_info.type = WebCursorInfo::TypeNorthSouthResize;
   } else if ([cursor isEqual:[NSCursor openHandCursor]]) {
     cursor_info.type = WebCursorInfo::TypeGrab;
   } else if ([cursor isEqual:[NSCursor closedHandCursor]]) {
     cursor_info.type = WebCursorInfo::TypeGrabbing;
   } else if ([cursor isEqual:[NSCursor operationNotAllowedCursor]]) {
     cursor_info.type = WebCursorInfo::TypeNotAllowed;
-  } else if ([NSCursor respondsToSelector:@selector(dragCopyCursor)] &&
-             [cursor isEqual:[NSCursor dragCopyCursor]]) {
+  } else if ([cursor isEqual:[NSCursor dragCopyCursor]]) {
     cursor_info.type = WebCursorInfo::TypeCopy;
-  } else if ([NSCursor respondsToSelector:@selector(contextualMenuCursor)] &&
-             [cursor isEqual:[NSCursor contextualMenuCursor]]) {
+  } else if ([cursor isEqual:[NSCursor contextualMenuCursor]]) {
     cursor_info.type = WebCursorInfo::TypeContextMenu;
   } else if (
       [NSCursor respondsToSelector:@selector(IBeamCursorForVerticalLayout)] &&
       [cursor isEqual:[NSCursor IBeamCursorForVerticalLayout]]) {
     cursor_info.type = WebCursorInfo::TypeVerticalText;
   } else {
     // Also handles the [NSCursor disappearingItemCursor] case. Quick-and-dirty
     // image conversion; TODO(avi): do better.
     CGImageRef cg_image = nil;
     NSImage* image = [cursor image];
@@ skipping 33 matching lines @@
   return true;
 }
 
 void WebCursor::CleanupPlatformData() {
   return;
 }
 
 void WebCursor::CopyPlatformData(const WebCursor& other) {
   return;
 }