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 <halcanary@google.com>
Commit-Queue: Hal Canary <halcanary@google.com>
diff --git a/tests/CodecTest.cpp b/tests/CodecTest.cpp
index ab21e4a..787e854 100644
--- a/tests/CodecTest.cpp
+++ b/tests/CodecTest.cpp
@@ -846,9 +846,8 @@
// Test that the RawCodec works also for not asset stream. This will test the code path using
// SkRawBufferedStream instead of SkRawAssetStream.
DEF_TEST(Codec_raw_notseekable, r) {
- const char* path = "images/dng_with_preview.dng";
- SkString fullPath(GetResourcePath(path));
- sk_sp<SkData> data(SkData::MakeFromFileName(fullPath.c_str()));
+ constexpr char path[] = "images/dng_with_preview.dng";
+ sk_sp<SkData> data(GetResourceAsData(path));
if (!data) {
SkDebugf("Missing resource '%s'\n", path);
return;
@@ -865,9 +864,8 @@
// Test that even if webp_parse_header fails to peek enough, it will fall back to read()
// + rewind() and succeed.
DEF_TEST(Codec_webp_peek, r) {
- const char* path = "images/baby_tux.webp";
- SkString fullPath(GetResourcePath(path));
- auto data = SkData::MakeFromFileName(fullPath.c_str());
+ constexpr char path[] = "images/baby_tux.webp";
+ auto data = GetResourceAsData(path);
if (!data) {
SkDebugf("Missing resource '%s'\n", path);
return;
@@ -1003,8 +1001,7 @@
const int dstWidth = subsetWidth / opts.fSampleSize;
const int dstHeight = subsetHeight / opts.fSampleSize;
- sk_sp<SkData> data = SkData::MakeFromFileName(
- GetResourcePath("icc_profiles/HP_ZR30w.icc").c_str());
+ sk_sp<SkData> data = GetResourceAsData("icc_profiles/HP_ZR30w.icc");
sk_sp<SkColorSpace> colorSpace = SkColorSpace::MakeICC(data->data(), data->size());
SkImageInfo dstInfo = codec->getInfo().makeWH(dstWidth, dstHeight)
.makeColorType(kN32_SkColorType)
@@ -1386,12 +1383,14 @@
}
static void test_invalid_header(skiatest::Reporter* r, const char* path) {
- SkString resourcePath = GetResourcePath(path);
- auto stream = SkFILEStream::Make(resourcePath.c_str());
+ auto data = GetResourceAsData(path);
+ if (!data) {
+ return;
+ }
+ std::unique_ptr<SkStreamAsset> stream(new SkMemoryStream(std::move(data)));
if (!stream) {
return;
}
-
std::unique_ptr<SkCodec> codec(SkCodec::MakeFromStream(std::move(stream)));
REPORTER_ASSERT(r, !codec);
}