Add the ability to write comments to PNGCodec::Encode.

skia/ext/image_operations_unittest.cc

 // 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.
 
 #include <algorithm>
 #include <iomanip>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/file_util.h"
 #include "base/string_util.h"
 #include "skia/ext/image_operations.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "third_party/skia/include/core/SkRect.h"
 #include "ui/gfx/codec/png_codec.h"
+#include "ui/gfx/size.h"
 
 namespace {
 
 // Computes the average pixel value for the given range, inclusive.
 uint32_t AveragePixel(const SkBitmap& bmp,
                       int x_min, int x_max,
                       int y_min, int y_max) {
   float accum[4] = {0, 0, 0, 0};
   int count = 0;
   for (int y = y_min; y <= y_max; y++) {
@@ skipping 159 matching lines @@
 // to check them visually.
 #define DEBUG_BITMAP_GENERATION (0)
 
 #if DEBUG_BITMAP_GENERATION
 void SaveBitmapToPNG(const SkBitmap& bmp, const char* path) {
   SkAutoLockPixels lock(bmp);
   std::vector<unsigned char> png;
   gfx::PNGCodec::ColorFormat color_format = gfx::PNGCodec::FORMAT_RGBA;
   if (!gfx::PNGCodec::Encode(
           reinterpret_cast<const unsigned char*>(bmp.getPixels()),
-          color_format, bmp.width(), bmp.height(),
+          color_format, gfx::Size(bmp.width(), bmp.height()),
           static_cast<int>(bmp.rowBytes()),
-          false, &png)) {
+          false, std::vector<gfx::PNGCodec::Comment>(), &png)) {
     FAIL() << "Failed to encode image";
   }
 
   const FilePath fpath(path);
   const int num_written =
       file_util::WriteFile(fpath, reinterpret_cast<const char*>(&png[0]),
                            png.size());
   if (num_written != static_cast<int>(png.size())) {
     FAIL() << "Failed to write dest \"" << path << '"';
   }
@@ skipping 425 matching lines @@
     ADD_FAILURE() << "Maximum observed color distance: "
                   << max_observed_distance;
 
 #if DEBUG_BITMAP_GENERATION
     SaveBitmapToPNG(src, "/tmp/CompareLanczosMethods_source.png");
     SaveBitmapToPNG(dest_l2, "/tmp/CompareLanczosMethods_lanczos2.png");
     SaveBitmapToPNG(dest_l3, "/tmp/CompareLanczosMethods_lanczos3.png");
 #endif  // #if DEBUG_BITMAP_GENERATION
   }
 }