add SkRecordOptimize2 and an experimental API for more aggressive opts

tools/dump_record.cpp

 /*
  * Copyright 2014 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "DumpRecord.h"
 #include "LazyDecodeBitmap.h"
 #include "SkCommandLineFlags.h"
 #include "SkPicture.h"
 #include "SkPictureRecorder.h"
 #include "SkRecordDraw.h"
 #include "SkRecordOpts.h"
 #include "SkRecorder.h"
 #include "SkStream.h"
 #include <stdio.h>
 
 DEFINE_string2(skps, r, "", ".SKPs to dump.");
 DEFINE_string(match, "", "The usual filters on file names to dump.");
 DEFINE_bool2(optimize, O, false, "Run SkRecordOptimize before dumping.");
+DEFINE_bool(optimize2, false, "Run SkRecordOptimize2 before dumping.");
 DEFINE_int32(tile, 1000000000, "Simulated tile size.");
 DEFINE_bool(timeWithCommand, false, "If true, print time next to command, else in first column.");
 DEFINE_string2(write, w, "", "Write the (optimized) picture to the named file.");
 
 static void dump(const char* name, int w, int h, const SkRecord& record) {
     SkBitmap bitmap;
     bitmap.allocN32Pixels(w, h);
     SkCanvas canvas(bitmap);
     canvas.clipRect(SkRect::MakeWH(SkIntToScalar(FLAGS_tile),
                                    SkIntToScalar(FLAGS_tile)));
@@ skipping 26 matching lines @@
         const int w = SkScalarCeilToInt(src->cullRect().width());
         const int h = SkScalarCeilToInt(src->cullRect().height());
 
         SkRecord record;
         SkRecorder canvas(&record, w, h);
         src->playback(&canvas);
 
         if (FLAGS_optimize) {
             SkRecordOptimize(&record);
         }
+        if (FLAGS_optimize2) {
+            SkRecordOptimize2(&record);
+        }
 
         dump(FLAGS_skps[i], w, h, record);
 
         if (FLAGS_write.count() > 0) {
             SkPictureRecorder r;
             SkRecordDraw(record,
                          r.beginRecording(SkRect::MakeIWH(w, h)),
                          nullptr,
                          nullptr,
                          0,
                          nullptr,
                          nullptr);
             SkAutoTUnref<SkPicture> dst(r.endRecording());
             SkFILEWStream ostream(FLAGS_write[0]);
             dst->serialize(&ostream);
         }
     }
 
     return 0;
 }
 
 #if !defined SK_BUILD_FOR_IOS
 int main(int argc, char * const argv[]) {
     return tool_main(argc, (char**) argv);
 }
 #endif