From cca230055921d2df8708ed6f9abcc2d43468dc7f Mon Sep 17 00:00:00 2001 From: Mike Reed Date: Fri, 8 Dec 2017 21:09:12 +0000 Subject: Revert "resources: remove most uses of GetResourcePath()" This reverts commit 5093a539def3ae09df324018f2343827009b2e05. Reason for revert: google3 seems broken Original change's description: > resources: remove most uses of GetResourcePath() > > Going forward, we will standardize on GetResourceAsData(), which will > make it easier to run tests in environments without access to the > filesystem. > > Also: GetResourceAsData() complains when a resource is missing. > This is usually an error. > > Change-Id: Iaf70b71b0ca5ed8cd1a5538a60ef185ae8736188 > Reviewed-on: https://skia-review.googlesource.com/82642 > Reviewed-by: Hal Canary > Commit-Queue: Hal Canary TBR=halcanary@google.com,scroggo@google.com Change-Id: Ic5a7c0167c995a672e6b06dc92abe00564432214 No-Presubmit: true No-Tree-Checks: true No-Try: true Reviewed-on: https://skia-review.googlesource.com/83001 Reviewed-by: Mike Reed Commit-Queue: Mike Reed --- dm/DM.cpp | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'dm/DM.cpp') diff --git a/dm/DM.cpp b/dm/DM.cpp index ebd2fe4b56..d2c127c133 100644 --- a/dm/DM.cpp +++ b/dm/DM.cpp @@ -1357,8 +1357,12 @@ int main(int argc, char** argv) { SkTaskGroup::Enabler enabled(FLAGS_threads); gCreateTypefaceDelegate = &create_from_name; - if (nullptr == GetResourceAsData("images/color_wheel.png")) { - info("Some resources are missing. Do you need to set --resourcePath?\n"); + { + SkString testResourcePath = GetResourcePath("images/color_wheel.png"); + SkFILEStream testResource(testResourcePath.c_str()); + if (!testResource.isValid()) { + info("Some resources are missing. Do you need to set --resourcePath?\n"); + } } gather_gold(); gather_uninteresting_hashes(); -- cgit v1.2.3