From 7557bbbe19b0d56484fe039171e4d97b75f209b3 Mon Sep 17 00:00:00 2001
From: Mike Reed <reed@google.com>
Date: Sun, 24 Dec 2017 19:50:57 -0500
Subject: Revert "remove approxbytes api from SkPicture"

This reverts commit bfc11853a88cda6951ae97399577fadadf2adcd5.

Bug: skia:
Change-Id: Ied4baad0496a06a52bec6965f9c97e13ebe2ab0a
Reviewed-on: https://skia-review.googlesource.com/89442
Reviewed-by: Mike Reed <reed@google.com>
Commit-Queue: Mike Reed <reed@google.com>
---
 bench/nanobench.cpp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'bench')

diff --git a/bench/nanobench.cpp b/bench/nanobench.cpp
index 8cd8e8171f..a50138a624 100644
--- a/bench/nanobench.cpp
+++ b/bench/nanobench.cpp
@@ -738,6 +738,7 @@ public:
             SkString name = SkOSPath::Basename(path.c_str());
             fSourceType = "skp";
             fBenchType  = "recording";
+            fSKPBytes = static_cast<double>(pic->approximateBytesUsed());
             fSKPOps   = pic->approximateOpCount();
             return new RecordingBench(name.c_str(), pic.get(), FLAGS_bbh, FLAGS_lite);
         }
@@ -752,6 +753,7 @@ public:
             SkString name = SkOSPath::Basename(path.c_str());
             fSourceType = "skp";
             fBenchType  = "piping";
+            fSKPBytes = static_cast<double>(pic->approximateBytesUsed());
             fSKPOps   = pic->approximateOpCount();
             return new PipingBench(name.c_str(), pic.get());
         }
@@ -766,6 +768,7 @@ public:
             SkString name = SkOSPath::Basename(path.c_str());
             fSourceType = "skp";
             fBenchType  = "deserial";
+            fSKPBytes = static_cast<double>(data->size());
             fSKPOps   = 0;
             return new DeserializePictureBench(name.c_str(), std::move(data));
         }
@@ -1059,6 +1062,7 @@ public:
             }
         }
         if (0 == strcmp(fBenchType, "recording")) {
+            log->metric("bytes", fSKPBytes);
             log->metric("ops",   fSKPOps);
         }
     }
@@ -1089,7 +1093,7 @@ private:
     SkScalar           fZoomMax;
     double             fZoomPeriodMs;
 
-    double fSKPOps;
+    double fSKPBytes, fSKPOps;
 
     const char* fSourceType;  // What we're benching: bench, GM, SKP, ...
     const char* fBenchType;   // How we bench it: micro, recording, playback, ...
-- 
cgit v1.2.3