Move simple png encoding for image_diff into tools/

tools/imagediff/image_diff.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.
 
 // This file input format is based loosely on
 // Tools/DumpRenderTree/ImageDiff.m
 
 // The exact format of this tool's output to stdout is important, to match
 // what the run-webkit-tests script expects.
 
 #include <algorithm>
 #include <iostream>
 #include <string>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/command_line.h"
 #include "base/file_util.h"
 #include "base/files/file_path.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/process/memory.h"
 #include "base/safe_numerics.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
-#include "webkit/support/webkit_support_gfx.h"
+#include "tools/imagediff/image_diff_png.h"
 
 #if defined(OS_WIN)
 #include "windows.h"
 #endif
 
 // Causes the app to remain open, waiting for pairs of filenames on stdin.
 // The caller is then responsible for terminating this app.
 static const char kOptionPollStdin[] = "use-stdin";
 static const char kOptionGenerateDiff[] = "diff";
 
@@ skipping 36 matching lines @@
   // Creates the image from stdin with the given data length. On success, it
   // will return true. On failure, no other methods should be accessed.
   bool CreateFromStdin(size_t byte_length) {
     if (byte_length == 0)
       return false;
 
     scoped_ptr<unsigned char[]> source(new unsigned char[byte_length]);
     if (fread(source.get(), 1, byte_length, stdin) != byte_length)
       return false;
 
-    if (!webkit_support::DecodePNG(source.get(), byte_length,
+    if (!image_diff_png::DecodePNG(source.get(), byte_length,
                                    &data_, &w_, &h_)) {
       Clear();
       return false;
     }
     return true;
   }
 
   // Creates the image from the given filename on disk, and returns true on
   // success.
   bool CreateFromFilename(const base::FilePath& path) {
     FILE* f = file_util::OpenFile(path, "rb");
     if (!f)
       return false;
 
     std::vector<unsigned char> compressed;
     const int buf_size = 1024;
     unsigned char buf[buf_size];
     size_t num_read = 0;
     while ((num_read = fread(buf, 1, buf_size, f)) > 0) {
       compressed.insert(compressed.end(), buf, buf + num_read);
     }
 
     file_util::CloseFile(f);
 
-    if (!webkit_support::DecodePNG(&compressed[0], compressed.size(),
+    if (!image_diff_png::DecodePNG(&compressed[0], compressed.size(),
                                    &data_, &w_, &h_)) {
       Clear();
       return false;
     }
     return true;
   }
 
   void Clear() {
     w_ = h_ = 0;
     data_.clear();
@@ skipping 189 matching lines @@
             file2.value().c_str());
     return kStatusError;
   }
 
   Image diff_image;
   bool same = CreateImageDiff(baseline_image, actual_image, &diff_image);
   if (same)
     return kStatusSame;
 
   std::vector<unsigned char> png_encoding;
-  webkit_support::EncodeRGBAPNG(
+  image_diff_png::EncodeRGBAPNG(
       diff_image.data(), diff_image.w(), diff_image.h(),
       diff_image.w() * 4, &png_encoding);
   if (file_util::WriteFile(out_file,
           reinterpret_cast<char*>(&png_encoding.front()),
           base::checked_numeric_cast<int>(png_encoding.size())) < 0)
     return kStatusError;
 
   return kStatusDifferent;
 }
 
@@ skipping 43 matching lines @@
                         base::FilePath(args[1]),
                         base::FilePath(args[2]));
     }
   } else if (args.size() == 2) {
     return CompareImages(base::FilePath(args[0]), base::FilePath(args[1]));
   }
 
   PrintHelp();
   return kStatusError;
 }