Upload picture byte size and op count metrics for SKP recording.

bench/ResultsWriter.h

 /*
  * Copyright 2013 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  *
  * Classes for writing out bench results in various formats.
  */
 
 #ifndef SkResultsWriter_DEFINED
@@ skipping 16 matching lines @@
     virtual ~ResultsWriter() {}
 
     // Record one key value pair that makes up a unique key for this type of run, e.g.
     // builder name, machine type, Debug/Release, etc.
     virtual void key(const char name[], const char value[]) {}
 
     // Record one key value pair that describes the run instance, e.g. git hash, build number.
     virtual void property(const char name[], const char value[]) {}
 
     // Denote the start of a specific benchmark. Once bench is called,
-    // then config and timer can be called multiple times to record runs.
+    // then config and metric can be called multiple times to record runs.
     virtual void bench(const char name[], int32_t x, int32_t y) {}
 
     // Record the specific configuration a bench is run under, such as "8888".
     virtual void config(const char name[]) {}
 
     // Record the options for a configuration, such as "GL_RENDERER".
     virtual void configOption(const char name[], const char* value) {}
 
     // Record a single test metric.
-    virtual void timer(const char name[], double ms) {}
+    virtual void metric(const char name[], double ms) {}
 
     // Flush to storage now please.
     virtual void flush() {}
 };
 
 /**
  NanoJSONResultsWriter writes the test results out in the following
  format:
 
  {
@@ skipping 40 matching lines @@
         fResults[id.c_str()] = Json::Value(Json::objectValue);
         fBench = &fResults[id.c_str()];
     }
     virtual void config(const char name[]) {
         SkASSERT(fBench);
         fConfig = &(*fBench)[name];
     }
     virtual void configOption(const char name[], const char* value) {
         (*fConfig)["options"][name] = value;
     }
-    virtual void timer(const char name[], double ms) {
+    virtual void metric(const char name[], double ms) {
         // Don't record if nan, or -nan.
         if (sk_double_isnan(ms)) {
             return;
         }
         SkASSERT(fConfig);
         (*fConfig)[name] = ms;
     }
 
     // Flush to storage now please.
     virtual void flush() {
         SkFILEWStream stream(fFilename.c_str());
         stream.writeText(Json::StyledWriter().write(fRoot).c_str());
         stream.flush();
     }
 
 private:
     SkString fFilename;
     Json::Value fRoot;
     Json::Value& fResults;
     Json::Value* fBench;
     Json::Value* fConfig;
 };
 
 
 #endif