Reverting r18743.

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@18755 0039d316-1c4b-4281-b951-d872f2087c98

3 files changed, 0 insertions, 174 deletions

diff --git a/skia/ext/skia_utils_mac.h b/skia/ext/skia_utils_mac.h
index 06cb151..14cd17f 100644
--- a/skia/ext/skia_utils_mac.h
+++ b/skia/ext/skia_utils_mac.h
@@ -57,9 +57,6 @@ SkBitmap CGImageToSkBitmap(CGImageRef image);
 #ifdef __OBJC__
 // Draws an NSImage with a given size into a SkBitmap.
 SkBitmap NSImageToSkBitmap(NSImage* image, NSSize size, bool is_opaque);
-
-// Given an SkBitmap, return an autoreleased NSImage.
-NSImage* SkBitmapToNSImage(const SkBitmap& icon);
 #endif
 
 }  // namespace gfx
diff --git a/skia/ext/skia_utils_mac.mm b/skia/ext/skia_utils_mac.mm
index 3295be0..6880ea8 100644
--- a/skia/ext/skia_utils_mac.mm
+++ b/skia/ext/skia_utils_mac.mm
@@ -10,19 +10,6 @@
 #include "base/scoped_cftyperef.h"
 #include "base/scoped_ptr.h"
 #include "skia/ext/bitmap_platform_device_mac.h"
-#include "third_party/skia/include/utils/mac/SkCGUtils.h"
-#include "third_party/skia/include/core/SkColorPriv.h"
-
-namespace {
-
-// Callback passed to CGDataProviderCreateWithData()
-void ReleaseData(void* info, const void* pixelData, size_t size) {
-  // info is a non-const pixelData
-  if (info)
-    free(info);
-}
-
-}
 
 namespace gfx {
 
@@ -169,79 +156,4 @@ SkBitmap NSImageToSkBitmap(NSImage* image, NSSize size, bool is_opaque) {
   return bitmap;
 }
 
-NSImage* SkBitmapToNSImage(const SkBitmap& icon) {
-  // First convert SkBitmap to CGImageRef.
-  CGImageRef cgimage;
-  if (icon.config() != SkBitmap::kARGB_8888_Config) {
-    cgimage = SkCreateCGImageRef(icon);
-  } else {
-    // The above code returns a valid NSImage even in the
-    // kARGB_8888_Config case.  As an example, the unit test which
-    // draws a blue SkBitmap can lockPixels, NSReadPixel, and pull out
-    // a single pixel from the NSImage and see it blue.  However, the
-    // NSImage returned will be in ABGR format.  Although Cocoa is
-    // otherwise happy with that format (as seen in simple tests
-    // outside Chromium), Chromium is NOT happy.  In Chromium, B and R
-    // are swapped.
-    //
-    // As a hint, CIImage supports a few formats, such as ARGB.
-    // Interestingly, it does NOT support ABGR.  I speculate there is
-    // some way we set up our drawing context which has the format
-    // specified wrong (in skia/ext/bitmap_platform_device_mac.cc),
-    // but I have not been able to solve this yet.
-    //
-    // TODO(jrg): track down the disconnect.
-    // TODO(jrg): Remove byte conversion.
-    // TODO(jrg): Fix unit tests to NOT swap bytes.
-    // http://crbug.com/14020
-    CGBitmapInfo info = (kCGImageAlphaPremultipliedFirst |
-                         kCGBitmapByteOrder32Host);
-    int width = icon.width();
-    int height = icon.height();
-    int rowbytes = icon.rowBytes();
-    int rowwords = rowbytes/4;
-    unsigned length = rowbytes * height;
-    DCHECK(length > 0);
-    uint32_t* rawptr = static_cast<uint32_t*>(malloc(length));
-    DCHECK(rawptr);
-    if (!rawptr || !length)
-      return nil;
-
-    // Convert ABGR to ARGB
-    icon.lockPixels();
-    uint32_t* rawbitmap = static_cast<uint32_t*>(icon.getPixels());
-    uint32_t rawbit;
-    int offset;
-    for (int y = 0; y < height; y++) {
-      for (int x = 0; x < width; x++) {
-        offset = x + y*rowwords;
-        rawbit = rawbitmap[offset];
-        rawptr[offset] = SkPackARGB32(SkGetPackedA32(rawbit),
-                                      SkGetPackedR32(rawbit),
-                                      SkGetPackedG32(rawbit),
-                                      SkGetPackedB32(rawbit));
-      }
-    }
-    icon.unlockPixels();
-
-    CGDataProviderRef dataRef =
-      CGDataProviderCreateWithData(rawptr, rawptr, length, ReleaseData);
-    CGColorSpaceRef space = CGColorSpaceCreateWithName(kCGColorSpaceGenericRGB);
-    cgimage = CGImageCreate(width, height, 8,
-                            icon.bytesPerPixel() * 8,
-                            rowbytes, space, info, dataRef,
-                            NULL, false, kCGRenderingIntentDefault);
-    CGColorSpaceRelease(space);
-    CGDataProviderRelease(dataRef);
-  }
-
-  // Now convert to NSImage.
-  NSBitmapImageRep* bitmap = [[[NSBitmapImageRep alloc]
-                                   initWithCGImage:cgimage] autorelease];
-  CFRelease(cgimage);
-  NSImage* image = [[[NSImage alloc] init] autorelease];
-  [image addRepresentation:bitmap];
-  return image;
-}
-
 }  // namespace gfx
diff --git a/skia/ext/skia_utils_mac_unittest.mm b/skia/ext/skia_utils_mac_unittest.mm
deleted file mode 100644
index ce1e7c2..0000000
--- a/skia/ext/skia_utils_mac_unittest.mm
+++ /dev/null
@@ -1,83 +0,0 @@
-// Copyright (c) 2009 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.
-
-#import "chrome/browser/cocoa/cocoa_test_helper.h"
-#include "skia/ext/skia_utils_mac.mm"
-#include "testing/gtest/include/gtest/gtest.h"
-
-namespace {
-
-class SkiaUtilsMacTest : public testing::Test {
- public:
-  CocoaTestHelper cocoa_helper_;  // Inits Cocoa, creates window, etc...
-
-  // If not red, is blue.
-  // If not tfbit (twenty-four-bit), is 444.
-  // If swap, swap R and B before testing (see TODOs in skia_utils_mac.mm)
-  void ShapeHelper(int width, int height, bool isred, bool tfbit, bool swap);
-};
-
-void SkiaUtilsMacTest::ShapeHelper(int width, int height,
-                                 bool isred, bool tfbit, bool swap) {
-  SkBitmap thing;
-
-  if (tfbit)
-    thing.setConfig(SkBitmap::kARGB_8888_Config, width, height);
-  else
-    thing.setConfig(SkBitmap::kARGB_4444_Config, width, height);
-  thing.allocPixels();
-
-  if (isred)
-    thing.eraseRGB(0xff, 0, 0);
-  else
-    thing.eraseRGB(0, 0, 0xff);
-
-  // Confirm size
-  NSImage* image = gfx::SkBitmapToNSImage(thing);
-  EXPECT_DOUBLE_EQ([image size].width, (double)width);
-  EXPECT_DOUBLE_EQ([image size].height, (double)height);
-
-  // Get the color of a pixel and make sure it looks fine
-  [image lockFocus];
-
-  int x = width > 17 ? 17 : 0;
-  int y = height > 17 ? 17 : 0;
-  NSColor* color = NSReadPixel(NSMakePoint(x, y));
-  CGFloat red = 0, green = 0, blue = 0, alpha = 0;
-  [image unlockFocus];
-  [color getRed:&red green:&green blue:&blue alpha:&alpha];
-
-  if (swap) {
-    CGFloat tmp = red;
-    red = blue;
-    blue = tmp;
-  }
-
-  // Be tolerant of floating point rounding, gamma, etc.
-  if (isred) {
-    EXPECT_GT(red, 0.8);
-    EXPECT_LT(blue, 0.2);
-  } else {
-    EXPECT_LT(red, 0.2);
-    EXPECT_GT(blue, 0.8);
-  }
-  EXPECT_LT(green, 0.2);
-  EXPECT_GT(alpha, 0.9);
-}
-
-
-TEST_F(SkiaUtilsMacTest, BitmapToNSImage_RedSquare64x64) {
-  ShapeHelper(64, 64, true, true, true);
-}
-
-TEST_F(SkiaUtilsMacTest, BitmapToNSImage_BlueRectangle199x19) {
-  ShapeHelper(199, 19, false, true, true);
-}
-
-TEST_F(SkiaUtilsMacTest, BitmapToNSImage_BlueRectangle444) {
-  ShapeHelper(200, 200, false, false, false);
-}
-
-
-}  // namespace