Don't test the old picture backend anymore.
This saves a bunch of CPU time in DM, and even better, lets us tear it down!
BUG=skia:
R=robertphillips@google.com, mtklein@google.com
Author: mtklein@chromium.org
Review URL: https://codereview.chromium.org/612603002
diff --git a/dm/DMQuiltTask.cpp b/dm/DMQuiltTask.cpp
index 9898dda..3d7daf2 100644
--- a/dm/DMQuiltTask.cpp
+++ b/dm/DMQuiltTask.cpp
@@ -12,18 +12,11 @@
namespace DM {
-static SkString suffix(QuiltTask::Backend backend, QuiltTask::BBH bbh) {
- static const char* kBackends[] = { "default", "skrecord" };
- static const char* kBBHs[] = { "nobbh", "rtree", "tilegrid" };
- return SkStringPrintf("%s-%s", kBackends[backend], kBBHs[bbh]);
-}
-
-QuiltTask::QuiltTask(const Task& parent, skiagm::GM* gm, SkBitmap reference,
- QuiltTask::BBH bbh, QuiltTask::Backend backend)
+static const char* kBBHs[] = { "nobbh", "rtree", "tilegrid" };
+QuiltTask::QuiltTask(const Task& parent, skiagm::GM* gm, SkBitmap reference, QuiltTask::BBH bbh)
: CpuTask(parent)
, fBBH(bbh)
- , fBackend(backend)
- , fName(UnderJoin(parent.name().c_str(), suffix(backend, bbh).c_str()))
+ , fName(UnderJoin(parent.name().c_str(), kBBHs[bbh]))
, fGM(gm)
, fReference(reference)
{}
@@ -83,8 +76,7 @@
factory.reset(NULL);
}
- SkAutoTUnref<const SkPicture> recorded(
- RecordPicture(fGM.get(), factory.get(), kSkRecord_Backend == fBackend));
+ SkAutoTUnref<const SkPicture> recorded(RecordPicture(fGM.get(), factory.get()));
SkBitmap full;
AllocatePixels(fReference, &full);