Add before and after command count to filter tool

tools/filtermain.cpp

 /*
  * Copyright 2012 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkDebugCanvas.h"
 #include "SkDevice.h"
 #include "SkGraphics.h"
 #include "SkImageDecoder.h"
 #include "SkImageEncoder.h"
 #include "SkOSFile.h"
 #include "SkPicture.h"
 #include "SkPicturePlayback.h"
 #include "SkPictureRecord.h"
 #include "SkStream.h"
 #include "picture_utils.h"
 #include "path_utils.h"
 
 static void usage() {
     SkDebugf("Usage: filter -i inFile [-o outFile] [--input-dir path] [--output-dir path]\n");
     SkDebugf("                        [-h|--help]\n\n");
-    SkDebugf("    -i inFile  : file to file.\n");
+    SkDebugf("    -i inFile  : file to filter.\n");
     SkDebugf("    -o outFile : result of filtering.\n");
     SkDebugf("    --input-dir : process all files in dir with .skp extension.\n");
     SkDebugf("    --output-dir : results of filtering the input dir.\n");
     SkDebugf("    -h|--help  : Show this help message.\n");
 }
 
 // Is the supplied paint simply a color?
 static bool is_simple(const SkPaint& p) {
     return NULL == p.getPathEffect() &&
            NULL == p.getShader() &&
@@ skipping 612 matching lines @@
     inPicture->draw(&debugCanvas);
 
     // delete the initial save and restore since replaying the commands will
     // re-add them
     if (debugCanvas.getSize() > 1) {
         debugCanvas.deleteDrawCommandAt(0);
         debugCanvas.deleteDrawCommandAt(debugCanvas.getSize()-1);
     }
 
     bool changed = true;
+    int numBefore = debugCanvas.getSize();
 
     while (changed) {
         changed = false;
         for (int i = 0; i < debugCanvas.getSize(); ++i) {
             for (size_t opt = 0; opt < SK_ARRAY_COUNT(gOptTable); ++opt) {
                 if ((*gOptTable[opt].fCheck)(&debugCanvas, i)) {
                     (*gOptTable[opt].fApply)(&debugCanvas, i);
 
                     ++gOptTable[opt].fNumTimesApplied;
                     ++localCount[opt];
 
                     if (debugCanvas.getSize() == i) {
                         // the optimization removed all the remaining operations
                         break;
                     }
 
                     opt = 0;          // try all the opts all over again
                     changed = true;
                 }
             }
         }
     }
 
+    int numAfter = debugCanvas.getSize();
+
     if (!outFile.isEmpty()) {
         SkPicture outPicture;
 
         SkCanvas* canvas = outPicture.beginRecording(inPicture->width(), inPicture->height());
         debugCanvas.draw(canvas);
         outPicture.endRecording();
 
         SkFILEWStream outStream(outFile.c_str());
 
         outPicture.serialize(&outStream);
     }
 
     bool someOptFired = false;
     for (size_t opt = 0; opt < SK_ARRAY_COUNT(gOptTable); ++opt) {
         if (0 != localCount[opt]) {
             SkDebugf("%d: %d ", opt, localCount[opt]);
             someOptFired = true;
         }
     }
 
     if (!someOptFired) {
         SkDebugf("No opts fired\n");
     } else {
-        SkDebugf("\n");
+        SkDebugf("\t before: %d after: %d delta: %d\n", 
+                 numBefore, numAfter, numBefore-numAfter);
     }
 
     return 0;
 }
 
 // This function is not marked as 'static' so it can be referenced externally
 // in the iOS build.
 int tool_main(int argc, char** argv); // suppress a warning on mac
 
 int tool_main(int argc, char** argv) {
@@ skipping 81 matching lines @@
 
     SkGraphics::Term();
     return 0;
 }
 
 #if !defined SK_BUILD_FOR_IOS
 int main(int argc, char * const argv[]) {
     return tool_main(argc, (char**) argv);
 }
 #endif