skpbench: fix parser script for bots

- emits the timings as numbers instead of strings.
- moves 'bench_type' and 'source_type' into the key.

BUG=skia:

GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=4823

Change-Id: Ibf98891e21c5d4c8a794c207e60d0df78d8a063c
Reviewed-on: https://skia-review.googlesource.com/4823
Reviewed-by: Kevin Lubick <kjlubick@google.com>
Commit-Queue: Chris Dalton <csmartdalton@google.com>

tools/skpbench/skiaperf.py

@@ -65,9 +65,9 @@ class JSONDict(dict):
 def main():
   data = JSONDict(
     FLAGS.properties + \
-    ['key', JSONDict(FLAGS.key),
-     'bench_type', 'playback',
-     'source_type', 'skp'])
+    ['key', JSONDict(FLAGS.key + \
+                     ['bench_type', 'playback', \
+                      'source_type', 'skp'])])
 
   for src in FLAGS.sources:
     with open(src, mode='r') as infile:
@@ -80,7 +80,7 @@ def main():
         for result in ('accum', 'median'):
           data['results'][match.bench][match.config] \
               ['%s_%s_%s' % (result, match.clock, match.metric)] = \
-              match.get_string(result)
+              getattr(match, result)
 
   if FLAGS.outfile != '-':
     with open(FLAGS.outfile, 'w+') as outfile: