Revert 126889 - Implement input type=color UI

BUG=92608
TEST=


Review URL: http://codereview.chromium.org/9203001

TBR=keishi@chromium.org

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

2 files changed, 0 insertions, 25 deletions

diff --git a/skia/ext/skia_utils_mac.h b/skia/ext/skia_utils_mac.h
index 683ddf0..8d11165 100644
--- a/skia/ext/skia_utils_mac.h
+++ b/skia/ext/skia_utils_mac.h
@@ -64,13 +64,8 @@ SkColor CGColorRefToSkColor(CGColorRef color);
 // Converts ARGB to CGColorRef.
 CGColorRef SkColorToCGColorRef(SkColor color);
 
-// Converts NSColor to ARGB. Returns raw rgb values and does no colorspace
-// conversion. Only valid for colors in calibrated and device color spaces.
-SK_API SkColor NSDeviceColorToSkColor(NSColor* color);
-
 // Converts ARGB to NSColor.
 SK_API NSColor* SkColorToCalibratedNSColor(SkColor color);
-SK_API NSColor* SkColorToDeviceNSColor(SkColor color);
 
 // Converts a CGImage to a SkBitmap.
 SK_API SkBitmap CGImageToSkBitmap(CGImageRef image);
diff --git a/skia/ext/skia_utils_mac.mm b/skia/ext/skia_utils_mac.mm
index 0c82a95e..d639460 100644
--- a/skia/ext/skia_utils_mac.mm
+++ b/skia/ext/skia_utils_mac.mm
@@ -190,19 +190,6 @@ CGColorRef SkColorToCGColorRef(SkColor color) {
                                  SkColorGetA(color) / 255.0);
 }
 
-// Converts NSColor to ARGB
-SkColor NSDeviceColorToSkColor(NSColor* color) {
-  DCHECK([color colorSpace] == [NSColorSpace genericRGBColorSpace] ||
-         [color colorSpace] == [NSColorSpace deviceRGBColorSpace]);
-  CGFloat red, green, blue, alpha;
-  color = [color colorUsingColorSpace:[NSColorSpace deviceRGBColorSpace]];
-  [color getRed:&red green:&green blue:&blue alpha:&alpha];
-  return SkColorSetARGB(SkScalarRound(255.0 * alpha),
-                        SkScalarRound(255.0 * red),
-                        SkScalarRound(255.0 * green),
-                        SkScalarRound(255.0 * blue));
-}
-
 // Converts ARGB to NSColor.
 NSColor* SkColorToCalibratedNSColor(SkColor color) {
   return [NSColor colorWithCalibratedRed:SkColorGetR(color) / 255.0
@@ -211,13 +198,6 @@ NSColor* SkColorToCalibratedNSColor(SkColor color) {
                                    alpha:SkColorGetA(color) / 255.0];
 }
 
-NSColor* SkColorToDeviceNSColor(SkColor color) {
-  return [NSColor colorWithDeviceRed:SkColorGetR(color) / 255.0
-                               green:SkColorGetG(color) / 255.0
-                                blue:SkColorGetB(color) / 255.0
-                               alpha:SkColorGetA(color) / 255.0];
-}
-
 SkBitmap CGImageToSkBitmap(CGImageRef image) {
   if (!image)
     return SkBitmap();