Use SkPngEncoder in gfx jpeg_codec

ui/gfx/codec/png_codec.h

 // Copyright (c) 2011 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.
 
 #ifndef UI_GFX_CODEC_PNG_CODEC_H_
 #define UI_GFX_CODEC_PNG_CODEC_H_
 
 #include <stddef.h>
 
 #include <string>
 #include <vector>
 
 #include "base/macros.h"
+#include "third_party/skia/include/core/SkImageInfo.h"
+#include "third_party/skia/include/core/SkPixmap.h"
 #include "ui/gfx/codec/codec_export.h"
 
 class SkBitmap;
 
 namespace gfx {
 
 class Size;
 
 // Interface for encoding and decoding PNG data. This is a wrapper around
 // libpng, which has an inconvenient interface for callers. This is currently
@@ skipping 20 matching lines @@
 
   // Represents a comment in the tEXt ancillary chunk of the png.
   struct CODEC_EXPORT Comment {
     Comment(const std::string& k, const std::string& t);
     ~Comment();
 
     std::string key;
     std::string text;
   };
 
-  // Encodes the given raw 'input' data, with each pixel being represented as
-  // given in 'format'. The encoded PNG data will be written into the supplied
-  // vector and true will be returned on success. On failure (false), the
-  // contents of the output buffer are undefined.
+  // Encodes the given raw 'input' pixmap, which includes a pointer to pixels as
+  // well as information describing the pixel format. The encoded PNG data will
+  // be written into the supplied vector and true will be returned on success.
+  // On failure (false), the contents of the output buffer are undefined.
   //
   // When writing alpha values, the input colors are assumed to be post
   // multiplied.
   //
-  // size: dimensions of the image
-  // row_byte_width: the width in bytes of each row. This may be greater than
-  //   w * bytes_per_pixel if there is extra padding at the end of each row
-  //   (often, each row is padded to the next machine word).
-  // discard_transparency: when true, and when the input data format includes
-  //   alpha values, these alpha values will be discarded and only RGB will be
-  //   written to the resulting file. Otherwise, alpha values in the input
-  //   will be preserved.
   // comments: comments to be written in the png's metadata.
-  static bool Encode(const unsigned char* input,
-                     ColorFormat format,
-                     const Size& size,
-                     int row_byte_width,
-                     bool discard_transparency,
+  static bool Encode(const SkPixmap& input,
                      const std::vector<Comment>& comments,
                      std::vector<unsigned char>* output);
 
   // Call PNGCodec::Encode on the supplied SkBitmap |input|, which is assumed
   // to be kARGB_8888_Config, 32 bits per pixel. The params
   // |discard_transparency| and |output| are passed directly to Encode; refer to
   // Encode for more information.
   static bool EncodeBGRASkBitmap(const SkBitmap& input,
                                  bool discard_transparency,
                                  std::vector<unsigned char>* output);
@@ skipping 35 matching lines @@
   static bool Decode(const unsigned char* input, size_t input_size,
                      SkBitmap* bitmap);
 
  private:
   DISALLOW_COPY_AND_ASSIGN(PNGCodec);
 };
 
 }  // namespace gfx
 
 #endif  // UI_GFX_CODEC_PNG_CODEC_H_