re-do CL 2136 - move image_diff to tools/imagediff, add deps to test_shell

moving image_diff from chrome/tools/test/image_diff to tools/imagediff
(not moving to tools/image_diff to avoid some svn unpleasantness with that
directory having been created in CL 21366). 

Also change test_shell.gyp to depend on everything needed to run the layout
tests.

R=darin@chromium.org
TEST=none
BUG=none

Review URL: http://codereview.chromium.org/159361

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@21584 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 388 insertions, 0 deletions

diff --git a/tools/imagediff/image_diff.cc b/tools/imagediff/image_diff.cc
new file mode 100644
index 0000000..044b89c
--- /dev/null
+++ b/tools/imagediff/image_diff.cc
@@ -0,0 +1,364 @@
+// Copyright (c) 2006-2008 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
+// WebKitTools/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 <vector>
+#include <string>
+#include <iostream>
+
+#include "base/basictypes.h"
+#include "base/command_line.h"
+#include "base/file_util.h"
+#include "base/gfx/png_decoder.h"
+#include "base/gfx/png_encoder.h"
+#include "base/logging.h"
+#include "base/process_util.h"
+#include "base/scoped_ptr.h"
+#include "base/string_util.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 wchar_t kOptionPollStdin[] = L"use-stdin";
+static const wchar_t kOptionGenerateDiff[] = L"diff";
+
+// Return codes used by this utility.
+static const int kStatusSame = 0;
+static const int kStatusDifferent = 1;
+static const int kStatusError = 2;
+
+// Color codes.
+static const uint32 RGBA_RED = 0x000000ff;
+static const uint32 RGBA_ALPHA = 0xff000000;
+
+class Image {
+ public:
+  Image() : w_(0), h_(0) {
+  }
+
+  Image(const Image& image)
+      : w_(image.w_),
+        h_(image.h_),
+        data_(image.data_) {
+  }
+
+  bool has_image() const {
+    return w_ > 0 && h_ > 0;
+  }
+
+  int w() const {
+    return w_;
+  }
+
+  int h() const {
+    return h_;
+  }
+
+  const unsigned char* data() const {
+    return &data_.front();
+  }
+
+  // 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_array<unsigned char> source(new unsigned char[byte_length]);
+    if (fread(source.get(), 1, byte_length, stdin) != byte_length)
+      return false;
+
+    if (!PNGDecoder::Decode(source.get(), byte_length, PNGDecoder::FORMAT_RGBA,
+                          &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 char* filename) {
+    FILE* f = file_util::OpenFile(std::string(filename), "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) {
+      std::copy(buf, &buf[num_read], std::back_inserter(compressed));
+    }
+
+    file_util::CloseFile(f);
+
+    if (!PNGDecoder::Decode(&compressed[0], compressed.size(),
+                          PNGDecoder::FORMAT_RGBA, &data_, &w_, &h_)) {
+      Clear();
+      return false;
+    }
+    return true;
+  }
+
+  void Clear() {
+    w_ = h_ = 0;
+    data_.clear();
+  }
+
+  // Returns the RGBA value of the pixel at the given location
+  const uint32 pixel_at(int x, int y) const {
+    DCHECK(x >= 0 && x < w_);
+    DCHECK(y >= 0 && y < h_);
+    return *reinterpret_cast<const uint32*>(&(data_[(y * w_ + x) * 4]));
+  }
+
+  void set_pixel_at(int x, int y, uint32 color) const {
+    DCHECK(x >= 0 && x < w_);
+    DCHECK(y >= 0 && y < h_);
+    void* addr = &const_cast<unsigned char*>(&data_.front())[(y * w_ + x) * 4];
+    *reinterpret_cast<uint32*>(addr) = color;
+  }
+
+ private:
+  // pixel dimensions of the image
+  int w_, h_;
+
+  std::vector<unsigned char> data_;
+};
+
+float PercentageDifferent(const Image& baseline, const Image& actual) {
+  int w = std::min(baseline.w(), actual.w());
+  int h = std::min(baseline.h(), actual.h());
+
+  // compute pixels different in the overlap
+  int pixels_different = 0;
+  for (int y = 0; y < h; y++) {
+    for (int x = 0; x < w; x++) {
+      if (baseline.pixel_at(x, y) != actual.pixel_at(x, y))
+        pixels_different++;
+    }
+  }
+
+  // count pixels that are a difference in size as also being different
+  int max_w = std::max(baseline.w(), actual.w());
+  int max_h = std::max(baseline.h(), actual.h());
+
+  // ...pixels off the right side, but not including the lower right corner
+  pixels_different += (max_w - w) * h;
+
+  // ...pixels along the bottom, including the lower right corner
+  pixels_different += (max_h - h) * max_w;
+
+  // Like the WebKit ImageDiff tool, we define percentage different in terms
+  // of the size of the 'actual' bitmap.
+  float total_pixels = static_cast<float>(actual.w()) *
+                       static_cast<float>(actual.h());
+  if (total_pixels == 0)
+    return 100.0f;  // when the bitmap is empty, they are 100% different
+  return static_cast<float>(pixels_different) / total_pixels * 100;
+}
+
+void PrintHelp() {
+  fprintf(stderr,
+    "Usage:\n"
+    "  image_diff <compare file> <reference file>\n"
+    "    Compares two files on disk, returning 0 when they are the same\n"
+    "  image_diff --use-stdin\n"
+    "    Stays open reading pairs of filenames from stdin, comparing them,\n"
+    "    and sending 0 to stdout when they are the same\n"
+    "  image_diff --diff <compare file> <reference file> <output file>\n"
+    "    Compares two files on disk, outputs an image that visualizes the"
+    "    difference to <output file>\n");
+  /* For unfinished webkit-like-mode (see below)
+    "\n"
+    "  image_diff -s\n"
+    "    Reads stream input from stdin, should be EXACTLY of the format\n"
+    "    \"Content-length: <byte length> <data>Content-length: ...\n"
+    "    it will take as many file pairs as given, and will compare them as\n"
+    "    (cmp_file, reference_file) pairs\n");
+  */
+}
+
+int CompareImages(const char* file1, const char* file2) {
+  Image actual_image;
+  Image baseline_image;
+
+  if (!actual_image.CreateFromFilename(file1)) {
+    fprintf(stderr, "image_diff: Unable to open file \"%s\"\n", file1);
+    return kStatusError;
+  }
+  if (!baseline_image.CreateFromFilename(file2)) {
+    fprintf(stderr, "image_diff: Unable to open file \"%s\"\n", file2);
+    return kStatusError;
+  }
+
+  float percent = PercentageDifferent(actual_image, baseline_image);
+  if (percent > 0.0) {
+    // failure: The WebKit version also writes the difference image to
+    // stdout, which seems excessive for our needs.
+    printf("diff: %01.2f%% failed\n", percent);
+    return kStatusDifferent;
+  }
+
+  // success
+  printf("diff: %01.2f%% passed\n", percent);
+  return kStatusSame;
+
+/* Untested mode that acts like WebKit's image comparator. I wrote this but
+   decided it's too complicated. We may use it in the future if it looks useful
+
+  char buffer[2048];
+  while (fgets(buffer, sizeof(buffer), stdin)) {
+
+    if (strncmp("Content-length: ", buffer, 16) == 0) {
+      char* context;
+      strtok_s(buffer, " ", &context);
+      int image_size = strtol(strtok_s(NULL, " ", &context), NULL, 10);
+
+      bool success = false;
+      if (image_size > 0 && actual_image.has_image() == 0) {
+        if (!actual_image.CreateFromStdin(image_size)) {
+          fputs("Error, input image can't be decoded.\n", stderr);
+          return 1;
+        }
+      } else if (image_size > 0 && baseline_image.has_image() == 0) {
+        if (!baseline_image.CreateFromStdin(image_size)) {
+          fputs("Error, baseline image can't be decoded.\n", stderr);
+          return 1;
+        }
+      } else {
+        fputs("Error, image size must be specified.\n", stderr);
+        return 1;
+      }
+    }
+
+    if (actual_image.has_image() && baseline_image.has_image()) {
+      float percent = PercentageDifferent(actual_image, baseline_image);
+      if (percent > 0.0) {
+        // failure: The WebKit version also writes the difference image to
+        // stdout, which seems excessive for our needs.
+        printf("diff: %01.2f%% failed\n", percent);
+      } else {
+        // success
+        printf("diff: %01.2f%% passed\n", percent);
+      }
+      actual_image.Clear();
+      baseline_image.Clear();
+    }
+
+    fflush(stdout);
+  }
+*/
+}
+
+bool CreateImageDiff(const Image& image1, const Image& image2, Image* out) {
+  int w = std::min(image1.w(), image2.w());
+  int h = std::min(image1.h(), image2.h());
+  *out = Image(image1);
+  bool same = (image1.w() == image2.w()) && (image1.h() == image2.h());
+
+  // TODO(estade): do something with the extra pixels if the image sizes
+  // are different.
+  for (int y = 0; y < h; y++) {
+    for (int x = 0; x < w; x++) {
+      uint32 base_pixel = image1.pixel_at(x, y);
+      if (base_pixel != image2.pixel_at(x, y)) {
+        // Set differing pixels red.
+        out->set_pixel_at(x, y, RGBA_RED | RGBA_ALPHA);
+        same = false;
+      } else {
+        // Set same pixels as faded.
+        uint32 alpha = base_pixel & RGBA_ALPHA;
+        uint32 new_pixel = base_pixel - ((alpha / 2) & RGBA_ALPHA);
+        out->set_pixel_at(x, y, new_pixel);
+      }
+    }
+  }
+
+  return same;
+}
+
+int DiffImages(const char* file1, const char* file2, const char* out_file) {
+  Image actual_image;
+  Image baseline_image;
+
+  if (!actual_image.CreateFromFilename(file1)) {
+    fprintf(stderr, "image_diff: Unable to open file \"%s\"\n", file1);
+    return kStatusError;
+  }
+  if (!baseline_image.CreateFromFilename(file2)) {
+    fprintf(stderr, "image_diff: Unable to open file \"%s\"\n", file2);
+    return kStatusError;
+  }
+
+  Image diff_image;
+  bool same = CreateImageDiff(baseline_image, actual_image, &diff_image);
+  if (same)
+    return kStatusSame;
+
+  std::vector<unsigned char> png_encoding;
+  PNGEncoder::Encode(diff_image.data(),  PNGEncoder::FORMAT_RGBA,
+                     diff_image.w(), diff_image.h(), diff_image.w() * 4,
+                     false, &png_encoding);
+  if (file_util::WriteFile(UTF8ToWide(out_file),
+      reinterpret_cast<char*>(&png_encoding.front()), png_encoding.size()) < 0)
+    return kStatusError;
+
+  return kStatusDifferent;
+}
+
+int main(int argc, const char* argv[]) {
+  base::EnableTerminationOnHeapCorruption();
+  CommandLine::Init(argc, argv);
+  const CommandLine& parsed_command_line = *CommandLine::ForCurrentProcess();
+  if (parsed_command_line.HasSwitch(kOptionPollStdin)) {
+    // Watch stdin for filenames.
+    std::string stdin_buffer;
+    std::string filename1_buffer;
+    bool have_filename1 = false;
+    while (std::getline(std::cin, stdin_buffer)) {
+      if (stdin_buffer.empty())
+        continue;
+
+      if (have_filename1) {
+        // CompareImages writes results to stdout unless an error occurred.
+        if (CompareImages(filename1_buffer.c_str(), stdin_buffer.c_str()) ==
+            kStatusError)
+          printf("error\n");
+        fflush(stdout);
+        have_filename1 = false;
+      } else {
+        // Save the first filename in another buffer and wait for the second
+        // filename to arrive via stdin.
+        filename1_buffer = stdin_buffer;
+        have_filename1 = true;
+      }
+    }
+    return 0;
+  }
+
+  std::vector<std::wstring> values = parsed_command_line.GetLooseValues();
+  if (parsed_command_line.HasSwitch(kOptionGenerateDiff)) {
+    if (values.size() == 3) {
+      return DiffImages(WideToUTF8(values[0]).c_str(),
+                        WideToUTF8(values[1]).c_str(),
+                        WideToUTF8(values[2]).c_str());
+    }
+  } else if (values.size() == 2) {
+    return CompareImages(argv[1], argv[2]);
+  }
+
+  PrintHelp();
+  return kStatusError;
+}
diff --git a/tools/imagediff/image_diff.gyp b/tools/imagediff/image_diff.gyp
new file mode 100644
index 0000000..0448f7c
--- /dev/null
+++ b/tools/imagediff/image_diff.gyp
@@ -0,0 +1,24 @@
+# Copyright (c) 2009 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.
+
+{
+  'includes': [
+    '../../build/common.gypi',
+  ],
+  'targets' : [ 
+    {
+      'target_name': 'image_diff',
+      'type': 'executable',
+      'msvs_guid': '50B079C7-CD01-42D3-B8C4-9F8D9322E822',
+      'dependencies': [
+        '../../base/base.gyp:base',
+        '../../base/base.gyp:base_gfx',
+      ],
+      'sources': [
+        'image_diff.cc',
+      ],
+    },
+  ],
+}
+