add SkRecordOptimize2 and an experimental API for more aggressive opts

tools/dump_record.cpp

Index: tools/dump_record.cpp
diff --git a/tools/dump_record.cpp b/tools/dump_record.cpp
index 1b5f1dc27cc95418d53bc4fc5029993b52132565..029638efb100d523ac8ab1c8916af25cccc8a2b6 100644
--- a/tools/dump_record.cpp
+++ b/tools/dump_record.cpp
@@ -19,6 +19,7 @@
 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.");
@@ -65,6 +66,9 @@ int tool_main(int argc, char** argv) {
         if (FLAGS_optimize) {
             SkRecordOptimize(&record);
         }
+        if (FLAGS_optimize2) {
+            SkRecordOptimize2(&record);
+        }
 
         dump(FLAGS_skps[i], w, h, record);