Use SkPngEncoder in gfx jpeg_codec

ui/gfx/codec/png_codec_unittest.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 <stddef.h>
 #include <stdint.h>
 
 #include <algorithm>
 #include <cmath>
 
@@ skipping 268 matching lines @@
 TEST(PNGCodec, EncodeDecodeRGBA) {
   const int w = 20, h = 20;
 
   // create an image with known values, a must be opaque because it will be
   // lost during encoding
   std::vector<unsigned char> original;
   MakeRGBAImage(w, h, true, &original);
 
   // encode
   std::vector<unsigned char> encoded;
-  ASSERT_TRUE(PNGCodec::Encode(&original[0], PNGCodec::FORMAT_RGBA,
-                               Size(w, h), w * 4, false,
-                               std::vector<PNGCodec::Comment>(),
+  ASSERT_TRUE(PNGCodec::Encode(&original[0], PNGCodec::FORMAT_RGBA, Size(w, h),

[msarett1, 2017/06/23 22:50:32]

Why is this file changed?

[liyuqian, 2017/07/05 15:59:40]

I've reverted the change. I think it's because that I changed it in an earlier
version, and my revert isn't complete.

+                               w * 4, false, std::vector<PNGCodec::Comment>(),
                                &encoded));
 
   // decode, it should have the same size as the original
   std::vector<unsigned char> decoded;
   int outw, outh;
   ASSERT_TRUE(PNGCodec::Decode(&encoded[0], encoded.size(),
                                PNGCodec::FORMAT_RGBA, &decoded,
                                &outw, &outh));
   ASSERT_EQ(w, outw);
   ASSERT_EQ(h, outh);
   ASSERT_EQ(original.size(), decoded.size());
 
   // Images must be exactly equal
   ASSERT_TRUE(original == decoded);
 }
 
 TEST(PNGCodec, EncodeDecodeBGRA) {
   const int w = 20, h = 20;
 
   // Create an image with known values, alpha must be opaque because it will be
   // lost during encoding.
   std::vector<unsigned char> original;
   MakeRGBAImage(w, h, true, &original);
 
   // Encode.
   std::vector<unsigned char> encoded;
-  ASSERT_TRUE(PNGCodec::Encode(&original[0], PNGCodec::FORMAT_BGRA,
-                               Size(w, h), w * 4, false,
-                               std::vector<PNGCodec::Comment>(),
+  ASSERT_TRUE(PNGCodec::Encode(&original[0], PNGCodec::FORMAT_BGRA, Size(w, h),
+                               w * 4, false, std::vector<PNGCodec::Comment>(),
                                &encoded));
 
   // Decode, it should have the same size as the original.
   std::vector<unsigned char> decoded;
   int outw, outh;
   ASSERT_TRUE(PNGCodec::Decode(&encoded[0], encoded.size(),
                                PNGCodec::FORMAT_BGRA, &decoded,
                                &outw, &outh));
   ASSERT_EQ(w, outw);
   ASSERT_EQ(h, outh);
@@ skipping 628 matching lines @@
       PNGCodec::Decode(&encoded_normal[0], encoded_normal.size(), &decoded));
   EXPECT_TRUE(BitmapsAreEqual(decoded, original_bitmap));
 
   EXPECT_TRUE(
       PNGCodec::Decode(&encoded_fast[0], encoded_fast.size(), &decoded));
   EXPECT_TRUE(BitmapsAreEqual(decoded, original_bitmap));
 }
 
 
 }  // namespace gfx