Merge 122386 - Fix Mac custom cursor color.

webkit/glue/webcursor_mac.mm

-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// 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 <Carbon/Carbon.h>
 
 #include "base/logging.h"
 #include "base/mac/mac_util.h"
@@ skipping 40 matching lines @@
 // 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
                                   hotSpot:NSMakePoint(x, y)] autorelease];
 }
 
+// TODO(avi): When Skia becomes default, fold this function into the remaining
+// caller, InitFromCursor().
 CGImageRef CreateCGImageFromCustomData(const std::vector<char>& custom_data,
                                        const gfx::Size& custom_size) {
-  // This is safe since we're not going to draw into the context we're creating.
-  // The settings here match SetCustomData() below; keep in sync.
   // If the data is missing, leave the backing transparent.
   void* data = NULL;
-  if (!custom_data.empty())
+  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]);
+  }
 
   // If the size is empty, use a 1x1 transparent image.
   gfx::Size size = custom_size;
   if (size.IsEmpty()) {
     size.SetSize(1, 1);
     data = NULL;
   }
 
   base::mac::ScopedCFTypeRef<CGColorSpaceRef> cg_color(
       CGColorSpaceCreateDeviceRGB());
+  // The settings here match SetCustomData() below; keep in sync.
   base::mac::ScopedCFTypeRef<CGContextRef> context(
       CGBitmapContextCreate(data,
                             size.width(),
                             size.height(),
                             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,
                              const gfx::Point& hotspot) {
+#if WEBKIT_USING_SKIA
+  // 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);
+  NSImage* cursor_image = gfx::SkBitmapToNSImage(bitmap);
+#else
   base::mac::ScopedCFTypeRef<CGImageRef> cg_image(
       CreateCGImageFromCustomData(custom_data, custom_size));
 
   scoped_nsobject<NSBitmapImageRep> ns_bitmap(
       [[NSBitmapImageRep alloc] initWithCGImage:cg_image.get()]);
-  NSImage* cursor_image = [[NSImage alloc] init];
+  scoped_nsobject<NSImage> cursor_image([[NSImage alloc] init]);
   DCHECK(cursor_image);
   [cursor_image addRepresentation:ns_bitmap];
+#endif  // WEBKIT_USING_SKIA
 
   NSCursor* cursor = [[NSCursor alloc] initWithImage:cursor_image
                                              hotSpot:NSMakePoint(hotspot.x(),
                                                                  hotspot.y())];
-  [cursor_image release];
 
   return [cursor autorelease];
 }
 
 }  // namespace
 
 // We're (mostly) matching Safari's cursor choices; see
 // platform/mac/CursorMac.mm . Note that Safari uses some magic in wkCursor to
 // access private system cursors. A sample implementation using the same
 // technique can be found attached to http://crbug.com/92892 . However, it's not
 // clear that accessing system cursors this way is enough of a gain to risk
 // using SPIs. Until the benefits more clearly outweigh the risks, API is all
 // that will be used.
-NSCursor* WebCursor::GetCursor() const {
+gfx::NativeCursor WebCursor::GetNativeCursor() {
   switch (type_) {
     case WebCursorInfo::TypePointer:
       return [NSCursor arrowCursor];
     case WebCursorInfo::TypeCross:
       return [NSCursor crosshairCursor];
     case WebCursorInfo::TypeHand:
       // If >= 10.7, the pointingHandCursor has a shadow so use it. Otherwise
       // use the custom one.
       if (base::mac::IsOSLionOrLater())
         return [NSCursor pointingHandCursor];
@@ skipping 84 matching lines @@
       return [NSCursor openHandCursor];
     case WebCursorInfo::TypeGrabbing:
       return [NSCursor closedHandCursor];
     case WebCursorInfo::TypeCustom:
       return CreateCustomCursor(custom_data_, custom_size_, hotspot_);
   }
   NOTREACHED();
   return nil;
 }
 
-gfx::NativeCursor WebCursor::GetNativeCursor() {
-  return GetCursor();
-}
-
 void WebCursor::InitFromThemeCursor(ThemeCursor cursor) {
   WebKit::WebCursorInfo cursor_info;
 
   switch (cursor) {
     case kThemeArrowCursor:
       cursor_info.type = WebCursorInfo::TypePointer;
       break;
     case kThemeCopyArrowCursor:
       cursor_info.type = WebCursorInfo::TypeCopy;
       break;
@@ skipping 90 matching lines @@
     }
   }
 
   base::mac::ScopedCFTypeRef<CGImageRef> cg_image(
       CreateCGImageFromCustomData(raw_data, custom_size));
 
   WebKit::WebCursorInfo cursor_info;
   cursor_info.type = WebCursorInfo::TypeCustom;
   cursor_info.hotSpot = WebKit::WebPoint(cursor->hotSpot.h, cursor->hotSpot.v);
 #if WEBKIT_USING_SKIA
+  // TODO(avi): build the cursor image in Skia directly rather than going via
+  // this roundabout path.
   cursor_info.customImage = gfx::CGImageToSkBitmap(cg_image.get());
 #else
   cursor_info.customImage = cg_image.get();
 #endif
 
   InitFromCursorInfo(cursor_info);
 }
 
 void WebCursor::InitFromNSCursor(NSCursor* cursor) {
   WebKit::WebCursorInfo cursor_info;
@@ skipping 97 matching lines @@
 }
 
 void WebCursor::ImageFromCustomData(WebImage* image) const {
   if (custom_data_.empty())
     return;
 
   base::mac::ScopedCFTypeRef<CGImageRef> cg_image(
       CreateCGImageFromCustomData(custom_data_, custom_size_));
   *image = cg_image.get();
 }
-#endif
+#endif  // !WEBKIT_USING_SKIA
 
 void WebCursor::InitPlatformData() {
   return;
 }
 
 bool WebCursor::SerializePlatformData(Pickle* pickle) const {
   return true;
 }
 
 bool WebCursor::DeserializePlatformData(const Pickle* pickle, void** iter) {
   return true;
 }
 
 bool WebCursor::IsPlatformDataEqual(const WebCursor& other) const {
   return true;
 }
 
 void WebCursor::CleanupPlatformData() {
   return;
 }
 
 void WebCursor::CopyPlatformData(const WebCursor& other) {
   return;
 }