Fix missing cursors.

webkit/glue/webcursor_mac.mm

 // Copyright (c) 2011 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 <Carbon/Carbon.h>
 
 #include "base/logging.h"
+#include "base/mac/mac_util.h"
 #include "base/mac/scoped_cftyperef.h"
 #include "base/memory/scoped_nsobject.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebCursorInfo.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebImage.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebSize.h"
 #include "ui/gfx/mac/nsimage_cache.h"
 
 #if WEBKIT_USING_SKIA
 #include "skia/ext/skia_utils_mac.h"
 #endif
 
 using WebKit::WebCursorInfo;
 using WebKit::WebImage;
 using WebKit::WebSize;
 
+// Forward-declare symbols that are part of the 10.6 SDK.

[Mark Mentovai, 2011/08/15 16:00:08]

Nit: These are declarations, not really anything especially “forward” about
them.

[Avi (use Gerrit), 2011/08/15 16:09:34]

Done.

+#if !defined(MAC_OS_X_VERSION_10_6) || \
+    MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_6
+
+@interface NSCursor (SnowLeopardSDKDeclarations)
++ (NSCursor *)contextualMenuCursor;

[Mark Mentovai, 2011/08/15 16:00:08]

Nit: This file uses NSCursor* style, no space.

[Avi (use Gerrit), 2011/08/15 16:09:34]

Done.

++ (NSCursor *)dragCopyCursor;
++ (NSCursor *)operationNotAllowedCursor;
+@end
+
+#endif  // MAC_OS_X_VERSION_10_6
+
+// Forward-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
+
+@interface NSCursor (LionSDKDeclarations)
++ (NSCursor *)IBeamCursorForVerticalLayout;
+@end
+
+#endif  // MAC_OS_X_VERSION_10_7
+
 namespace {
 
 // TODO: This image fetch can (and probably should) be serviced by the resource
 // resource bundle instead of going through the image cache.
 NSCursor* LoadCursor(const char* name, int x, int y) {
   NSString* file_name = [NSString stringWithUTF8String:name];
   DCHECK(file_name);
   NSImage* cursor_image = gfx::GetCachedImageWithName(file_name);
   DCHECK(cursor_image);
   return [[[NSCursor alloc] initWithImage:cursor_image
@@ skipping 51 matching lines @@
 }
 
 }  // namespace
 
 // We're matching Safari's cursor choices; see platform/mac/CursorMac.mm
 NSCursor* WebCursor::GetCursor() const {
   switch (type_) {
     case WebCursorInfo::TypePointer:
       return [NSCursor arrowCursor];
     case WebCursorInfo::TypeCross:
-      return LoadCursor("crossHairCursor", 11, 11);
+      return [NSCursor crosshairCursor];
     case WebCursorInfo::TypeHand:
-      return LoadCursor("linkCursor", 6, 1);
+      // If >= 10.7, the pointingHandCursor has a shadow so use it. Otherwise
+      // use the custom one.
+      if (base::mac::IsOSLionOrLater())
+        return [NSCursor pointingHandCursor];
+      else
+        return LoadCursor("linkCursor", 6, 1);
     case WebCursorInfo::TypeIBeam:
       return [NSCursor IBeamCursor];
     case WebCursorInfo::TypeWait:
       return LoadCursor("waitCursor", 7, 7);
     case WebCursorInfo::TypeHelp:
       return LoadCursor("helpCursor", 8, 8);
     case WebCursorInfo::TypeEastResize:
     case WebCursorInfo::TypeEastPanning:
       return LoadCursor("eastResizeCursor", 14, 7);
     case WebCursorInfo::TypeNorthResize:
@@ skipping 26 matching lines @@
     case WebCursorInfo::TypeNorthWestSouthEastResize:
       return LoadCursor("northWestSouthEastResizeCursor", 7, 7);
     case WebCursorInfo::TypeColumnResize:
       return [NSCursor resizeLeftRightCursor];
     case WebCursorInfo::TypeRowResize:
       return [NSCursor resizeUpDownCursor];
     case WebCursorInfo::TypeMiddlePanning:
     case WebCursorInfo::TypeMove:
       return LoadCursor("moveCursor", 7, 7);
     case WebCursorInfo::TypeVerticalText:
-      return LoadCursor("verticalTextCursor", 7, 7);
+      // IBeamCursorForVerticalLayout is >= 10.7.
+      if ([NSCursor respondsToSelector:@selector(IBeamCursorForVerticalLayout)])
+        return [NSCursor IBeamCursorForVerticalLayout];
+      else
+        return LoadCursor("verticalTextCursor", 7, 7);
     case WebCursorInfo::TypeCell:
       return LoadCursor("cellCursor", 7, 7);
     case WebCursorInfo::TypeContextMenu:
-      return LoadCursor("contextMenuCursor", 3, 2);
+      // contextualMenuCursor is >= 10.6.
+      if ([NSCursor respondsToSelector:@selector(contextualMenuCursor)])
+        return [NSCursor contextualMenuCursor];
+      else
+        return LoadCursor("contextMenuCursor", 3, 2);
     case WebCursorInfo::TypeAlias:
       return LoadCursor("aliasCursor", 11, 3);
     case WebCursorInfo::TypeProgress:
       return LoadCursor("progressCursor", 3, 2);
     case WebCursorInfo::TypeNoDrop:
       return LoadCursor("noDropCursor", 3, 1);
     case WebCursorInfo::TypeCopy:
-      return LoadCursor("copyCursor", 3, 2);
+      // dragCopyCursor is >= 10.6.
+      if ([NSCursor respondsToSelector:@selector(dragCopyCursor)])
+        return [NSCursor dragCopyCursor];
+      else
+        return LoadCursor("copyCursor", 3, 2);
     case WebCursorInfo::TypeNone:
       return LoadCursor("noneCursor", 7, 7);
     case WebCursorInfo::TypeNotAllowed:
-      return LoadCursor("notAllowedCursor", 11, 11);
+      // 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.

[Mark Mentovai, 2011/08/15 16:00:08]

Just be sure you test this.

[Avi (use Gerrit), 2011/08/15 16:09:34]

Tested.

+     return [NSCursor operationNotAllowedCursor];
     case WebCursorInfo::TypeZoomIn:
       return LoadCursor("zoomInCursor", 7, 7);
     case WebCursorInfo::TypeZoomOut:
       return LoadCursor("zoomOutCursor", 7, 7);
     case WebCursorInfo::TypeGrab:
       return [NSCursor openHandCursor];
     case WebCursorInfo::TypeGrabbing:
       return [NSCursor closedHandCursor];
     case WebCursorInfo::TypeCustom:
       return CreateCustomCursor(custom_data_, custom_size_, hotspot_);
@@ skipping 144 matching lines @@
   } else if ([cursor isEqual:[NSCursor resizeUpCursor]]) {
     cursor_info.type = WebCursorInfo::TypeNorthResize;
   } 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]]) {
+    cursor_info.type = WebCursorInfo::TypeCopy;
+  } else if ([NSCursor respondsToSelector:@selector(contextualMenuCursor)] &&
+             [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];
     for (id rep in [image representations]) {
       if ([rep isKindOfClass:[NSBitmapImageRep class]]) {
         cg_image = [rep CGImage];
         break;
       }
@@ skipping 75 matching lines @@
   return true;
 }
 
 void WebCursor::CleanupPlatformData() {
   return;
 }
 
 void WebCursor::CopyPlatformData(const WebCursor& other) {
   return;
 }