Merge 110499 - [Skia] Release CGImage used to apply color space conversion to SkBitmap

Source/WebCore/platform/image-decoders/skia/ImageDecoderSkia.cpp

 /*
  * Copyright (C) 2006 Apple Computer, Inc.  All rights reserved.
  * Copyright (C) 2008, 2009 Google, Inc.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
@@ skipping 101 matching lines @@
 void ImageFrame::setHasAlpha(bool alpha)
 {
     m_bitmap.bitmap().setIsOpaque(!alpha);
 }
 
 #if PLATFORM(CHROMIUM) && OS(DARWIN)
 static void resolveColorSpace(const SkBitmap& bitmap, CGColorSpaceRef colorSpace)
 {
     int width = bitmap.width();
     int height = bitmap.height();
-    CGImageRef srcImage = SkCreateCGImageRefWithColorspace(bitmap, colorSpace);
+    RetainPtr<CGImageRef> srcImage(AdoptCF, SkCreateCGImageRefWithColorspace(bitmap, colorSpace));
     SkAutoLockPixels lock(bitmap);
     void* pixels = bitmap.getPixels();
     RetainPtr<CGContextRef> cgBitmap(AdoptCF, CGBitmapContextCreate(pixels, width, height, 8, width * 4, deviceRGBColorSpaceRef(), kCGBitmapByteOrder32Host | kCGImageAlphaPremultipliedFirst));
     if (!cgBitmap)
         return;
     CGContextSetBlendMode(cgBitmap.get(), kCGBlendModeCopy);
     CGRect bounds = { {0, 0}, {width, height} };
-    CGContextDrawImage(cgBitmap.get(), bounds, srcImage);
+    CGContextDrawImage(cgBitmap.get(), bounds, srcImage.get());
 }
 
 static CGColorSpaceRef createColorSpace(const ColorProfile& colorProfile)
 {
     RetainPtr<CFDataRef> data(AdoptCF, CFDataCreate(kCFAllocatorDefault, reinterpret_cast<const UInt8*>(colorProfile.data()), colorProfile.size()));
 #ifndef TARGETING_LEOPARD
     return CGColorSpaceCreateWithICCProfile(data.get());
 #else
     RetainPtr<CGDataProviderRef> profileDataProvider(AdoptCF, CGDataProviderCreateWithCFData(data.get()));
     CGFloat ranges[] = {0.0, 255.0, 0.0, 255.0, 0.0, 255.0};
@@ skipping 31 matching lines @@
 {
     return m_bitmap.bitmap().width();
 }
 
 int ImageFrame::height() const
 {
     return m_bitmap.bitmap().height();
 }
 
 } // namespace WebCore