From fe75169912d5df74d4aab44f5552a31bb5d9b907 Mon Sep 17 00:00:00 2001 From: Brian Osman Date: Wed, 23 May 2018 10:58:18 -0400 Subject: Remove ColorCodecBench This wasn't being run (AFAICT) and was built on pre-skcms color management. Change-Id: I506e8767f716bc6e4590ce255c5e40f1064fc152 Reviewed-on: https://skia-review.googlesource.com/129644 Commit-Queue: Brian Osman Commit-Queue: Mike Klein Auto-Submit: Brian Osman Reviewed-by: Mike Klein --- bench/nanobench.cpp | 21 --------------------- 1 file changed, 21 deletions(-) (limited to 'bench/nanobench.cpp') diff --git a/bench/nanobench.cpp b/bench/nanobench.cpp index a156ad6ecc..8c89ec716c 100644 --- a/bench/nanobench.cpp +++ b/bench/nanobench.cpp @@ -14,7 +14,6 @@ #include "BitmapRegionDecoderBench.h" #include "CodecBench.h" #include "CodecBenchPriv.h" -#include "ColorCodecBench.h" #include "CrashHandler.h" #include "GMBench.h" #include "ProcStats.h" @@ -621,7 +620,6 @@ public: , fCurrentCodec(0) , fCurrentAndroidCodec(0) , fCurrentBRDImage(0) - , fCurrentColorImage(0) , fCurrentColorType(0) , fCurrentAlphaType(0) , fCurrentSubsetType(0) @@ -657,9 +655,6 @@ public: if (!CollectImages(FLAGS_images, &fImages)) { exit(1); } - if (!CollectImages(FLAGS_colorImages, &fColorImages)) { - exit(1); - } // Choose the candidate color types for image decoding fColorTypes.push_back(kN32_SkColorType); @@ -1048,20 +1043,6 @@ public: fCurrentColorType = 0; } - while (fCurrentColorImage < fColorImages.count()) { - fSourceType = "colorimage"; - fBenchType = "skcolorcodec"; - const SkString& path = fColorImages[fCurrentColorImage]; - fCurrentColorImage++; - sk_sp encoded = SkData::MakeFromFileName(path.c_str()); - if (encoded) { - return new ColorCodecBench(SkOSPath::Basename(path.c_str()).c_str(), - std::move(encoded)); - } else { - SkDebugf("Could not read file %s.\n", path.c_str()); - } - } - return nullptr; } @@ -1106,7 +1087,6 @@ private: SkTArray fSVGs; SkTArray fUseMPDs; SkTArray fImages; - SkTArray fColorImages; SkTArray fColorTypes; SkScalar fZoomMax; double fZoomPeriodMs; @@ -1125,7 +1105,6 @@ private: int fCurrentCodec; int fCurrentAndroidCodec; int fCurrentBRDImage; - int fCurrentColorImage; int fCurrentColorType; int fCurrentAlphaType; int fCurrentSubsetType; -- cgit v1.2.3