remove WEBKIT_USING_SKIA

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 <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 "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/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;
 
 // Declare symbols that are part of the 10.6 SDK.
 #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;
@@ skipping 56 matching lines @@
                             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()]);
-  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())];
 
   return [cursor autorelease];
 }
 
 }  // namespace
 
@@ skipping 211 matching lines @@
       mask <<= 1;
     }
   }
 
   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;
 
   if ([cursor isEqual:[NSCursor arrowCursor]]) {
     cursor_info.type = WebCursorInfo::TypePointer;
   } else if ([cursor isEqual:[NSCursor IBeamCursor]]) {
@@ skipping 39 matching lines @@
       if ([rep isKindOfClass:[NSBitmapImageRep class]]) {
         cg_image = [rep CGImage];
         break;
       }
     }
 
     if (cg_image) {
       cursor_info.type = WebCursorInfo::TypeCustom;
       NSPoint hot_spot = [cursor hotSpot];
       cursor_info.hotSpot = WebKit::WebPoint(hot_spot.x, hot_spot.y);
-#if WEBKIT_USING_SKIA
       cursor_info.customImage = gfx::CGImageToSkBitmap(cg_image);
-#else
-      cursor_info.customImage = cg_image;
-#endif
     } else {
       cursor_info.type = WebCursorInfo::TypePointer;
     }
   }
 
   InitFromCursorInfo(cursor_info);
 }
 
-#if !WEBKIT_USING_SKIA
-void WebCursor::SetCustomData(const WebImage& image) {
-  if (image.isNull())
-    return;
-
-  base::mac::ScopedCFTypeRef<CGColorSpaceRef> cg_color(
-      CGColorSpaceCreateDeviceRGB());
-
-  const WebSize& image_dimensions = image.size();
-  int image_width = image_dimensions.width;
-  int image_height = image_dimensions.height;
-
-  size_t size = image_height * image_width * 4;
-  custom_data_.resize(size);
-  custom_size_.set_width(image_width);
-  custom_size_.set_height(image_height);
-
-  // These settings match up with the code in CreateCustomCursor() above; keep
-  // them in sync.
-  // TODO(avi): test to ensure that the flags here are correct for RGBA
-  base::mac::ScopedCFTypeRef<CGContextRef> context(
-      CGBitmapContextCreate(&custom_data_[0],
-                            image_width,
-                            image_height,
-                            8,
-                            image_width * 4,
-                            cg_color.get(),
-                            kCGImageAlphaPremultipliedLast |
-                            kCGBitmapByteOrder32Big));
-  CGRect rect = CGRectMake(0, 0, image_width, image_height);
-  CGContextDrawImage(context.get(), rect, image.getCGImageRef());
-}
-
-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  // !WEBKIT_USING_SKIA
-
 void WebCursor::InitPlatformData() {
   return;
 }
 
 bool WebCursor::SerializePlatformData(Pickle* pickle) const {
   return true;
 }
 
 bool WebCursor::DeserializePlatformData(PickleIterator* iter) {
   return true;
 }
 
 bool WebCursor::IsPlatformDataEqual(const WebCursor& other) const {
   return true;
 }
 
 void WebCursor::CleanupPlatformData() {
   return;
 }
 
 void WebCursor::CopyPlatformData(const WebCursor& other) {
   return;
 }