Move skdiff tool and add to gn build.

I really wanted this today, so I got it working again.

Change-Id: I1a37d48d4806198b55c59d1df5ff15a03500195f
Reviewed-on: https://skia-review.googlesource.com/3383
Commit-Queue: Ben Wagner <bungeman@google.com>
Reviewed-by: Mike Klein <mtklein@chromium.org>

10 files changed, 34 insertions, 22 deletions

diff --git a/BUILD.gn b/BUILD.gn
index 7935e74330..e1f0fc8212 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -1061,4 +1061,18 @@ if (skia_enable_tools) {
     ]
     testonly = true
   }
+
+  executable("skdiff") {
+    sources = [
+      "tools/skdiff/skdiff.cpp",
+      "tools/skdiff/skdiff_html.cpp",
+      "tools/skdiff/skdiff_main.cpp",
+      "tools/skdiff/skdiff_utils.cpp",
+    ]
+    deps = [
+      ":skia",
+      ":tool_utils",
+    ]
+    testonly = true
+  }
 }
diff --git a/gyp/tools.gyp b/gyp/tools.gyp
index b41ecc4847..99edaa0301 100644
--- a/gyp/tools.gyp
+++ b/gyp/tools.gyp
@@ -201,13 +201,13 @@
       'target_name': 'skdiff',
       'type': 'executable',
       'sources': [
-        '../tools/skdiff.cpp',
-        '../tools/skdiff.h',
-        '../tools/skdiff_html.cpp',
-        '../tools/skdiff_html.h',
-        '../tools/skdiff_main.cpp',
-        '../tools/skdiff_utils.cpp',
-        '../tools/skdiff_utils.h',
+        '../tools/skdiff/skdiff.cpp',
+        '../tools/skdiff/skdiff.h',
+        '../tools/skdiff/skdiff_html.cpp',
+        '../tools/skdiff/skdiff_html.h',
+        '../tools/skdiff/skdiff_main.cpp',
+        '../tools/skdiff/skdiff_utils.cpp',
+        '../tools/skdiff/skdiff_utils.h',
       ],
       'dependencies': [
         'skia_lib.gyp:skia_lib',
@@ -232,13 +232,13 @@
       'target_name': 'skimagediff',
       'type': 'executable',
       'sources': [
-        '../tools/skdiff.cpp',
-        '../tools/skdiff.h',
-        '../tools/skdiff_html.cpp',
-        '../tools/skdiff_html.h',
-        '../tools/skdiff_image.cpp',
-        '../tools/skdiff_utils.cpp',
-        '../tools/skdiff_utils.h',
+        '../tools/skdiff/skdiff.cpp',
+        '../tools/skdiff/skdiff.h',
+        '../tools/skdiff/skdiff_html.cpp',
+        '../tools/skdiff/skdiff_html.h',
+        '../tools/skdiff/skdiff_image.cpp',
+        '../tools/skdiff/skdiff_utils.cpp',
+        '../tools/skdiff/skdiff_utils.h',
       ],
       'dependencies': [
         'skia_lib.gyp:skia_lib',
diff --git a/tools/skdiff.cpp b/tools/skdiff/skdiff.cpp
index ae6d72cd7a..ae6d72cd7a 100644
--- a/tools/skdiff.cpp
+++ b/tools/skdiff/skdiff.cpp
diff --git a/tools/skdiff.h b/tools/skdiff/skdiff.h
index eec5133eb3..6bdaadc28d 100644
--- a/tools/skdiff.h
+++ b/tools/skdiff/skdiff.h
@@ -73,7 +73,7 @@ struct DiffResource {
      */
     static bool getMatchingStatuses(char* selector, bool statuses[kStatusCount]);
 
-    DiffResource() : fFilename(), fFullPath(), fBitmap(), fStatus(kUnknown_Status) { };
+    DiffResource() : fFilename(), fFullPath(), fBitmap(), fStatus(kUnknown_Status) { }
 
     /** If isEmpty() indicates no filename available. */
     SkString fFilename;
@@ -125,7 +125,7 @@ struct DiffRecord {
         , fMaxMismatchG(0)
         , fMaxMismatchB(0)
         , fResult(kUnknown_Result) {
-    };
+    }
 
     DiffResource fBase;
     DiffResource fComparison;
diff --git a/tools/skdiff_html.cpp b/tools/skdiff/skdiff_html.cpp
index 6f3c3b09e1..6f3c3b09e1 100644
--- a/tools/skdiff_html.cpp
+++ b/tools/skdiff/skdiff_html.cpp
diff --git a/tools/skdiff_html.h b/tools/skdiff/skdiff_html.h
index eefbebf2fd..eefbebf2fd 100644
--- a/tools/skdiff_html.h
+++ b/tools/skdiff/skdiff_html.h
diff --git a/tools/skdiff_image.cpp b/tools/skdiff/skdiff_image.cpp
index f118d85b5c..287523de15 100644
--- a/tools/skdiff_image.cpp
+++ b/tools/skdiff/skdiff_image.cpp
@@ -10,8 +10,6 @@
 #include "SkData.h"
 #include "SkImageEncoder.h"
 #include "SkOSFile.h"
-#include "SkTDArray.h"
-#include "SkTemplates.h"
 #include "SkTypes.h"
 
 #include <stdio.h>
@@ -35,11 +33,11 @@ static void create_diff_images (DiffMetricProc dmp,
     drp->fComparison.fFullPath = comparisonFile;
     drp->fComparison.fStatus = DiffResource::kSpecified_Status;
 
-    SkAutoDataUnref baseFileBits(read_file(drp->fBase.fFullPath.c_str()));
+    sk_sp<SkData> baseFileBits = read_file(drp->fBase.fFullPath.c_str());
     if (baseFileBits) {
         drp->fBase.fStatus = DiffResource::kRead_Status;
     }
-    SkAutoDataUnref comparisonFileBits(read_file(drp->fComparison.fFullPath.c_str()));
+    sk_sp<SkData> comparisonFileBits = read_file(drp->fComparison.fFullPath.c_str());
     if (comparisonFileBits) {
         drp->fComparison.fStatus = DiffResource::kRead_Status;
     }
@@ -54,7 +52,7 @@ static void create_diff_images (DiffMetricProc dmp,
         return;
     }
 
-    if (are_buffers_equal(baseFileBits, comparisonFileBits)) {
+    if (are_buffers_equal(baseFileBits.get(), comparisonFileBits.get())) {
         drp->fResult = DiffRecord::kEqualBits_Result;
         return;
     }
diff --git a/tools/skdiff_main.cpp b/tools/skdiff/skdiff_main.cpp
index ef58b1bfc5..c51cd28d78 100644
--- a/tools/skdiff_main.cpp
+++ b/tools/skdiff/skdiff_main.cpp
@@ -66,7 +66,7 @@ struct DiffSummary {
         : fNumMatches(0)
         , fNumMismatches(0)
         , fMaxMismatchV(0)
-        , fMaxMismatchPercent(0) { };
+        , fMaxMismatchPercent(0) { }
 
     ~DiffSummary() {
         for (int i = 0; i < DiffRecord::kResultCount; ++i) {
diff --git a/tools/skdiff_utils.cpp b/tools/skdiff/skdiff_utils.cpp
index 609d75d265..609d75d265 100644
--- a/tools/skdiff_utils.cpp
+++ b/tools/skdiff/skdiff_utils.cpp
diff --git a/tools/skdiff_utils.h b/tools/skdiff/skdiff_utils.h
index c799325e36..c799325e36 100644
--- a/tools/skdiff_utils.h
+++ b/tools/skdiff/skdiff_utils.h