From fd9bcabca1d2bef215862e8a16df862899d9ceca Mon Sep 17 00:00:00 2001 From: Hal Canary Date: Tue, 24 Apr 2018 11:47:23 -0400 Subject: sk_tools/Resources: optional SK_TOOLS_REQUIRE_RESOURCES flag BUG=skia:7842 Change-Id: I1ce7d12308cd8ee101163d73dfc79f2d2155c632 Reviewed-on: https://skia-review.googlesource.com/123425 Auto-Submit: Hal Canary Commit-Queue: Florin Malita Reviewed-by: Florin Malita --- tools/Resources.cpp | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) (limited to 'tools/Resources.cpp') diff --git a/tools/Resources.cpp b/tools/Resources.cpp index 0e343c4883..183a8d807d 100644 --- a/tools/Resources.cpp +++ b/tools/Resources.cpp @@ -43,17 +43,15 @@ std::unique_ptr GetResourceAsStream(const char* resource) { } sk_sp GetResourceAsData(const char* resource) { - if (gResourceFactory) { - if (auto data = gResourceFactory(resource)) { - return data; - } - SkDebugf("Resource \"%s\" not found.\n", resource); - SK_ABORT("missing resource"); - } - if (auto data = SkData::MakeFromFileName(GetResourcePath(resource).c_str())) { + if (sk_sp data = gResourceFactory + ? gResourceFactory(resource) + : SkData::MakeFromFileName(GetResourcePath(resource).c_str())) { return data; } SkDebugf("Resource \"%s\" not found.\n", resource); + #ifdef SK_TOOLS_REQUIRE_RESOURCES + SK_ABORT("missing resource"); + #endif return nullptr; } -- cgit v1.2.3