commit 963504bd0a8ced7e1177ae136da03a9cc343d886
author mtklein <mtklein@google.com> Wed Sep 17 06:58:39 2014 -0700
committer Commit bot <commit-bot@chromium.org> Wed Sep 17 06:58:39 2014 -0700
tree 60549931ef677b5ae55a7f874b03d56f3c19098a
parent b0a35f7c5d2c4bfeb601e3ac43f412d202a25292

Revert of nanobench: lazily decode bitmaps from SKPs (patchset #1 id:1 of https://codereview.chromium.org/572933006/)

Reason for revert:
skia:2944

Original issue's description:
> nanobench: lazily decode bitmaps from SKPs
>
> This makes it considerably cheaper to run SKP recording benchmarks, without
> affecting their measurements and without really affecting SKP playback
> benchmarks at all.
>
> On my machine, running out/Release/nanobench --match skp --config nondrendering
> drops in run time from 6.7s to 2.5s, and the peak RAM usage drops from 129M to 50M.
>
> I'm strongly considering making this lazy decoding the default.
>
> BUG=skia:2944
>
> Committed: https://skia.googlesource.com/skia/+/d664c21a38de98d8db210c46f7a8c4187f1534da

R=robertphillips@google.com, mtklein@chromium.org
TBR=mtklein@chromium.org, robertphillips@google.com
NOTREECHECKS=true
NOTRY=true
BUG=skia:2944

Author: mtklein@google.com

Review URL: https://codereview.chromium.org/554583004

bench/nanobench.cpp

diff --git a/bench/nanobench.cpp b/bench/nanobench.cpp
index eff0b2f..67646c2 100644
--- a/bench/nanobench.cpp
+++ b/bench/nanobench.cpp
@@ -10,7 +10,6 @@
 #include "Benchmark.h"
 #include "CrashHandler.h"
 #include "GMBench.h"
-#include "LazyDecodeBitmap.h"
 #include "ProcStats.h"
 #include "ResultsWriter.h"
 #include "RecordingBench.h"
@@ -451,7 +450,7 @@
             return false;
         }
 
-        pic->reset(SkPicture::CreateFromStream(stream.get(), sk_tools::LazyDecodeBitmap));
+        pic->reset(SkPicture::CreateFromStream(stream.get()));
         if (pic->get() == NULL) {
             SkDebugf("Could not read %s as an SkPicture.\n", path);
             return false;

gyp/bench.gyp

diff --git a/gyp/bench.gyp b/gyp/bench.gyp
index 08f173c..26849d5 100644
--- a/gyp/bench.gyp
+++ b/gyp/bench.gyp
@@ -9,12 +9,11 @@
       'target_name': 'nanobench',
       'type': 'executable',
       'sources': [
+        '../gm/gm.cpp',
         '../bench/GMBench.cpp',
         '../bench/RecordingBench.cpp',
         '../bench/SKPBench.cpp',
         '../bench/nanobench.cpp',
-        '../gm/gm.cpp',
-        '../tools/LazyDecodeBitmap.cpp',
       ],
       'includes': [
         'bench.gypi',

gyp/iOSShell.gyp

diff --git a/gyp/iOSShell.gyp b/gyp/iOSShell.gyp
index 20c4994..ac2ed30 100644
--- a/gyp/iOSShell.gyp
+++ b/gyp/iOSShell.gyp
@@ -23,7 +23,6 @@
             '../bench/SKPBench.cpp',
             '../bench/nanobench.cpp',
             '../tests/skia_test.cpp',
-            '../tools/LazyDecodeBitmap.cpp',
             '../tools/iOSShell.cpp',
             '../src/views/mac/SkEventNotifier.mm',
             '../experimental/iOSSampleApp/SkiOSSampleApp-Base.xcconfig',