revert unreviewed 10194, will send to review

experimental/skpdiff/SkDiffContext.cpp

 /*
  * Copyright 2013 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkBitmap.h"
-#include "SkCommandLineFlags.h"
 #include "SkImageDecoder.h"
 #include "SkOSFile.h"
 #include "SkStream.h"
 
 #include "SkDiffContext.h"
 #include "SkImageDiffer.h"
 #include "skpdiff_util.h"
 
-DECLARE_string(csv);
-
 SkDiffContext::SkDiffContext() {
     fRecords = NULL;
     fDiffers = NULL;
     fDifferCount = 0;
 }
 
 SkDiffContext::~SkDiffContext() {
     // Delete the record linked list
     DiffRecord* currentRecord = fRecords;
     while (NULL != currentRecord) {
@@ skipping 34 matching lines @@
         return;
     }
 
     // Setup a record for this diff
     DiffRecord* newRecord = SkNEW(DiffRecord);
     newRecord->fBaselinePath = baselinePath;
     newRecord->fTestPath = testPath;
     newRecord->fNext = fRecords;
     fRecords = newRecord;
 
-    FILE* csvFile = NULL;
-    if (!FLAGS_csv.isEmpty()) {
-        csvFile = fopen(FLAGS_csv[0], "a");
-        SkASSERT(csvFile);
-        if (ftell(csvFile) == 0) {
-            fprintf(csvFile, "%s", "skp");
-            for (int differIndex = 0; differIndex < fDifferCount; differIndex++) {
-                SkImageDiffer* differ = fDiffers[differIndex];
-                fprintf(csvFile, ", %s", differ->getName());
-            }
-            fprintf(csvFile, "\n");
-        }
-    }
-
-    if (csvFile) {
-        const char* filename = baselinePath + strlen(baselinePath) - 1;
-        while (filename > baselinePath && *(filename - 1) != '/') {
-            filename--;
-        }
-        fprintf(csvFile, "%s", filename);
-    }
-
     // Perform each diff
     for (int differIndex = 0; differIndex < fDifferCount; differIndex++) {
         SkImageDiffer* differ = fDiffers[differIndex];
         int diffID = differ->queueDiff(&baselineBitmap, &testBitmap);
         if (diffID >= 0) {
 
             // Copy the results into data for this record
             DiffData& diffData = newRecord->fDiffs.push_back();
 
             diffData.fDiffName = differ->getName();
             diffData.fResult = differ->getResult(diffID);
 
-            if (csvFile) {
-                fprintf(csvFile, ", %f", diffData.fResult);
-            }
-
             int poiCount = differ->getPointsOfInterestCount(diffID);
             SkIPoint* poi = differ->getPointsOfInterest(diffID);
             diffData.fPointsOfInterest.append(poiCount, poi);
 
             // Because we are doing everything synchronously for now, we are done with the diff
             // after reading it.
             differ->deleteDiff(diffID);
-        } else {
-            if (csvFile) {
-                fprintf(csvFile, ", -1");
-            }
         }
     }
-
-    if (csvFile) {
-        fprintf(csvFile, "\n");
-        fclose(csvFile);
-    }
 }
 
 
 void SkDiffContext::diffDirectories(const char baselinePath[], const char testPath[]) {
     // Get the files in the baseline, we will then look for those inside the test path
     SkTArray<SkString> baselineEntries;
     if (!get_directory(baselinePath, &baselineEntries)) {
         SkDebugf("Unable to open path \"%s\"\n", baselinePath);
         return;
     }
@@ skipping 121 matching lines @@
     }
     stream.writeText("    ]\n");
     if (useJSONP) {
         stream.writeText("};\n");
     }
     else
     {
         stream.writeText("}\n");
     }
 }