Add support for PNG representation in gfx::Image

ui/gfx/image/image_util.cc

 // 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 "ui/gfx/image/image_util.h"
 
 #include "base/memory/scoped_ptr.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "ui/gfx/codec/jpeg_codec.h"
-#include "ui/gfx/codec/png_codec.h"
 #include "ui/gfx/image/image.h"
+#include "ui/gfx/image/image_png.h"
+#include "ui/gfx/image/image_skia.h"
 
 namespace gfx {
 
 Image* ImageFromPNGEncodedData(const unsigned char* input, size_t input_size) {
-  SkBitmap bitmap;
-  if (gfx::PNGCodec::Decode(input, input_size, &bitmap))
-    return new Image(bitmap);
-
-  return NULL;
+  Image* image = new Image(ImagePNG(input, input_size));
+  // Check if image can be converted to an ImageSkia and return NULL if
+  // conversion fails.
+  if (image->ToImageSkia()->empty())
+    return NULL;
+  return image;
 }
 
 Image ImageFromJPEGEncodedData(const unsigned char* input, size_t input_size) {
   scoped_ptr<SkBitmap> bitmap(gfx::JPEGCodec::Decode(input, input_size));
   if (bitmap.get())
     return Image(*bitmap);
 
   return Image();
 }
 
 bool PNGEncodedDataFromImage(const Image& image,
                              std::vector<unsigned char>* dst) {
-  const SkBitmap& bitmap = *image.ToSkBitmap();
-  return gfx::PNGCodec::EncodeBGRASkBitmap(bitmap, false, dst);
+  *dst = image.ToImagePNG()->Image();
+  return !dst->empty();
 }
 
 bool JPEGEncodedDataFromImage(const Image& image, int quality,
                               std::vector<unsigned char>* dst) {
   const SkBitmap& bitmap = *image.ToSkBitmap();
   SkAutoLockPixels bitmap_lock(bitmap);
 
   if (!bitmap.readyToDraw())
     return false;
 
   return gfx::JPEGCodec::Encode(
           reinterpret_cast<unsigned char*>(bitmap.getAddr32(0, 0)),
           gfx::JPEGCodec::FORMAT_BGRA, bitmap.width(),
           bitmap.height(),
           static_cast<int>(bitmap.rowBytes()), quality,
           dst);
 }
 
 }