aboutsummaryrefslogtreecommitdiff
path: root/tools/skqp
diff options
context:
space:
mode:
authorHal Canary <halcanary@google.com>2018-07-30 17:07:07 -0400
committerSkia Commit-Bot <skia-commit-bot@chromium.org>2018-08-01 16:59:19 +0000
commit972eba3c5c70e8e9774ebcc9d393f43edc5d823d (patch)
treee4fecf1020f5b5b76af33ebc59f4c083ffe8d302 /tools/skqp
parentda16cce7d9501871f762603118e88514c4318594 (diff)
downloadskqp-972eba3c5c70e8e9774ebcc9d393f43edc5d823d.tar.gz
sk_tool::Registry: make an iterator.
Change-Id: Icf4e31b50bbd91b7ea330a1300f736d6dfd0a41c Reviewed-on: https://skia-review.googlesource.com/144500 Commit-Queue: Ben Wagner <bungeman@google.com> Reviewed-by: Ben Wagner <bungeman@google.com> Auto-Submit: Hal Canary <halcanary@google.com>
Diffstat (limited to 'tools/skqp')
-rw-r--r--tools/skqp/gm_runner.cpp6
1 files changed, 2 insertions, 4 deletions
diff --git a/tools/skqp/gm_runner.cpp b/tools/skqp/gm_runner.cpp
index 778c2bc665..0cd031c26c 100644
--- a/tools/skqp/gm_runner.cpp
+++ b/tools/skqp/gm_runner.cpp
@@ -98,8 +98,7 @@ const char* GetUnitTestName(UnitTest test) { return test->name; }
std::vector<UnitTest> GetUnitTests() {
std::vector<UnitTest> tests;
- for (const skiatest::TestRegistry* r = skiatest::TestRegistry::Head(); r; r = r->next()) {
- const skiatest::Test& test = r->factory();
+ for (const skiatest::Test& test : skiatest::TestRegistry::Range()) {
if ((is_empty(gKnownGpuUnitTests) || in_set(test.name, gKnownGpuUnitTests))
&& test.needsGpu) {
tests.push_back(&test);
@@ -255,8 +254,7 @@ void InitSkia(Mode mode, skqp::AssetManager* mgr) {
std::vector<GMFactory> GetGMFactories(skqp::AssetManager* assetManager) {
std::vector<GMFactory> result;
- for (const skiagm::GMRegistry* r = skiagm::GMRegistry::Head(); r; r = r->next()) {
- GMFactory f = r->factory();
+ for (const GMFactory& f : skiagm::GMRegistry::Range()) {
SkASSERT(f);
auto name = GetGMName(f);
if ((is_empty(gKnownGMs) || in_set(name.c_str(), gKnownGMs)) &&