Make SKP bench JSON ouput better

tools/PictureBenchmark.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 "BenchTimer.h"
 #include "PictureBenchmark.h"
 #include "SkCanvas.h"
@@ skipping 155 matching lines @@
                     if (fPurgeDecodedTex) {
                         fRenderer->purgeTextures();
                     }
                 }
                 longRunningTimer->truncatedEnd();
                 tiledRenderer->resetState(true);       // flush, swapBuffers and Finish
                 longRunningTimer->end();
                 SkAssertResult(longRunningTimerData.appendTimes(longRunningTimer.get()));
             }
 
-            fWriter->tileConfig(tiledRenderer->getConfigName());
+            fWriter->logRenderer(tiledRenderer);
             fWriter->tileMeta(x, y, xTiles, yTiles);
 
             // TODO(borenet): Turn off per-iteration tile time reporting for now.
             // Avoiding logging the time for every iteration for each tile cuts
             // down on data file size by a significant amount. Re-enable this once
             // we're loading the bench data directly into a data store and are no
             // longer generating SVG graphs.
 #if 0
             fWriter->tileData(
                     &perTileTimerData,
@@ skipping 42 matching lines @@
                 if (fPurgeDecodedTex) {
                     fRenderer->purgeTextures();
                 }
             }
             longRunningTimer->truncatedEnd();
             fRenderer->resetState(true);        // flush, swapBuffers and Finish
             longRunningTimer->end();
             SkAssertResult(longRunningTimerData.appendTimes(longRunningTimer.get()));
         }
 
-        fWriter->tileConfig(fRenderer->getConfigName());
+        fWriter->logRenderer(fRenderer);
         if (fPurgeDecodedTex) {
             fWriter->addTileFlag(PictureResultsWriter::kPurging);
         }
 
         // Beware - since the per-run-timer doesn't ever include a glFinish it can
         // report a lower time then the long-running-timer
 #if 0
         fWriter->tileData(
                 &perRunTimerData,
                 timeFormat.c_str(),
                 fTimerResult,
                 timerTypes);
 #else
         fWriter->tileData(
                 &longRunningTimerData,
                 timeFormat.c_str(),
                 fTimerResult,
                 timerTypes,
                 numInnerLoops);
 #endif
     }
 
     fRenderer->end();
 }
 
 }