Add file icons to chrome://downloads/ on the Mac. Add Skia helper CGImageToSkBitmap().

webkit/glue/image_decoder.cc

 // Copyright (c) 2006-2008 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 "config.h"
 #include "webkit/glue/image_decoder.h"
 
 #include "base/compiler_specific.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 
 MSVC_PUSH_WARNING_LEVEL(0);
 #if defined(OS_WIN) || defined(OS_LINUX)
 #include "ImageSourceSkia.h"
 #include "NativeImageSkia.h"
 #elif defined(OS_MACOSX)
 #include "ImageSource.h"
 #include "RetainPtr.h"
+#include "skia/ext/skia_utils_mac.h"
 #endif
 #include "IntSize.h"
 #include "RefPtr.h"
 #include "SharedBuffer.h"
 MSVC_POP_WARNING();
 
 namespace webkit_glue {
 
 ImageDecoder::ImageDecoder() : desired_icon_size_(0, 0) {
 }
@@ skipping 38 matching lines @@
 
 #if defined(OS_WIN) || defined(OS_LINUX)
   SkBitmap retval = *reinterpret_cast<SkBitmap*>(frame0);
   delete frame0;
   return retval;
 #elif defined(OS_MACOSX)
   // TODO(port): should we delete frame0 like Linux/Windows do above?
   // BitmapImage releases automatically, but we're bypassing it so we'll need
   // to do the releasing.
   RetainPtr<CGImageRef> image(AdoptCF, frame0);
-
-  SkBitmap result;
-  result.setConfig(SkBitmap::kARGB_8888_Config, CGImageGetWidth(image.get()),
-                   CGImageGetHeight(image.get()));
-
-  // TODO(port):
-  // This line is a waste, but is needed when the renderer sends a
-  // ViewHostMsg_DidDownloadImage and tries to pickle the SkBitmap.
-  // Presumably this will be removed when we (ImageDecoder::Decode())
-  // are changed to not return a fake SkBitmap.
-  result.allocPixels();
-
-  RetainPtr<CGColorSpace> cg_color(AdoptCF, CGColorSpaceCreateDeviceRGB());
-  // The last parameter is a total guess. Feel free to adjust it if images draw
-  // incorrectly. TODO(avi): Verify byte ordering; it should be possible to
-  // swizzle bytes with various combinations of the byte order and alpha
-  // constants.
-  RetainPtr<CGContextRef> context(AdoptCF, CGBitmapContextCreate(
-                                             result.getPixels(),
-                                             result.width(),
-                                             result.height(),
-                                             result.bytesPerPixel() * 8 / 4,
-                                             result.rowBytes(),
-                                             cg_color.get(),
-                                             kCGImageAlphaPremultipliedFirst |
-                                             kCGBitmapByteOrder32Host));
-  CGRect rect = CGRectMake(0, 0,
-                           CGImageGetWidth(image.get()),
-                           CGImageGetHeight(image.get()));
-
-  // We want to copy transparent pixels from |image| over to |result|, instead
-  // of blending |image| onto the uninitialized pixels of |result|. Since
-  // |context| is used only locally, there's no need to restore the blend mode.
-  CGContextSetBlendMode(context.get(), kCGBlendModeCopy);
-
-  CGContextDrawImage(context.get(), rect, image.get());
-
-  return result;
+  return gfx::CGImageToSkBitmap(image.get());
 #endif
 }
 
 }  // namespace webkit_glue