From 972eba3c5c70e8e9774ebcc9d393f43edc5d823d Mon Sep 17 00:00:00 2001 From: Hal Canary Date: Mon, 30 Jul 2018 17:07:07 -0400 Subject: sk_tool::Registry: make an iterator. Change-Id: Icf4e31b50bbd91b7ea330a1300f736d6dfd0a41c Reviewed-on: https://skia-review.googlesource.com/144500 Commit-Queue: Ben Wagner Reviewed-by: Ben Wagner Auto-Submit: Hal Canary --- tools/skqp/gm_runner.cpp | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'tools/skqp') 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 GetUnitTests() { std::vector 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 GetGMFactories(skqp::AssetManager* assetManager) { std::vector 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)) && -- cgit v1.2.3