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 --- bench/ColorCodecBench.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'bench') diff --git a/bench/ColorCodecBench.cpp b/bench/ColorCodecBench.cpp index c38a8a712b..1239e1d4fe 100644 --- a/bench/ColorCodecBench.cpp +++ b/bench/ColorCodecBench.cpp @@ -74,7 +74,8 @@ void ColorCodecBench::onDelayedSetup() { matrix.set3x3(0.30f, 0.31f, 0.28f, 0.32f, 0.33f, 0.29f, 0.27f, 0.30f, 0.30f); fDstSpace = SkColorSpace::MakeRGB(gamma, matrix); } else { - sk_sp dstData = GetResourceAsData("icc_profiles/HP_ZR30w.icc"); + sk_sp dstData = SkData::MakeFromFileName( + GetResourcePath("icc_profiles/HP_ZR30w.icc").c_str()); SkASSERT(dstData); fDstSpace = SkColorSpace::MakeICC(dstData->data(), dstData->size()); } -- cgit v1.2.3