From 5093a539def3ae09df324018f2343827009b2e05 Mon Sep 17 00:00:00 2001 From: Hal Canary Date: Fri, 8 Dec 2017 11:38:47 -0500 Subject: 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 --- tests/ColorSpaceTest.cpp | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) (limited to 'tests/ColorSpaceTest.cpp') diff --git a/tests/ColorSpaceTest.cpp b/tests/ColorSpaceTest.cpp index 19e1044162..d180cda425 100644 --- a/tests/ColorSpaceTest.cpp +++ b/tests/ColorSpaceTest.cpp @@ -245,14 +245,13 @@ DEF_TEST(ColorSpace_Serialize, r) { test_serialize(r, SkColorSpace_Base::MakeNamed(SkColorSpace_Base::kAdobeRGB_Named).get(), true); test_serialize(r, SkColorSpace::MakeSRGBLinear().get(), true); - sk_sp monitorData = SkData::MakeFromFileName( - GetResourcePath("icc_profiles/HP_ZR30w.icc").c_str()); + sk_sp monitorData = GetResourceAsData("icc_profiles/HP_ZR30w.icc"); test_serialize(r, SkColorSpace::MakeICC(monitorData->data(), monitorData->size()).get(), false); - monitorData = SkData::MakeFromFileName( GetResourcePath("icc_profiles/HP_Z32x.icc").c_str()); + monitorData = GetResourceAsData("icc_profiles/HP_Z32x.icc"); test_serialize(r, SkColorSpace::MakeICC(monitorData->data(), monitorData->size()).get(), false); - monitorData = SkData::MakeFromFileName(GetResourcePath("icc_profiles/upperLeft.icc").c_str()); + monitorData = GetResourceAsData("icc_profiles/upperLeft.icc"); test_serialize(r, SkColorSpace::MakeICC(monitorData->data(), monitorData->size()).get(), false); - monitorData = SkData::MakeFromFileName(GetResourcePath("icc_profiles/upperRight.icc").c_str()); + monitorData = GetResourceAsData("icc_profiles/upperRight.icc"); test_serialize(r, SkColorSpace::MakeICC(monitorData->data(), monitorData->size()).get(), false); SkColorSpaceTransferFn fn; @@ -270,14 +269,13 @@ DEF_TEST(ColorSpace_Serialize, r) { DEF_TEST(ColorSpace_Equals, r) { sk_sp srgb = SkColorSpace::MakeSRGB(); sk_sp adobe = SkColorSpace_Base::MakeNamed(SkColorSpace_Base::kAdobeRGB_Named); - sk_sp data = SkData::MakeFromFileName( - GetResourcePath("icc_profiles/HP_ZR30w.icc").c_str()); + sk_sp data = GetResourceAsData("icc_profiles/HP_ZR30w.icc"); sk_sp z30 = SkColorSpace::MakeICC(data->data(), data->size()); - data = SkData::MakeFromFileName( GetResourcePath("icc_profiles/HP_Z32x.icc").c_str()); + data = GetResourceAsData("icc_profiles/HP_Z32x.icc"); sk_sp z32 = SkColorSpace::MakeICC(data->data(), data->size()); - data = SkData::MakeFromFileName(GetResourcePath("icc_profiles/upperLeft.icc").c_str()); + data = GetResourceAsData("icc_profiles/upperLeft.icc"); sk_sp upperLeft = SkColorSpace::MakeICC(data->data(), data->size()); - data = SkData::MakeFromFileName(GetResourcePath("icc_profiles/upperRight.icc").c_str()); + data = GetResourceAsData("icc_profiles/upperRight.icc"); sk_sp upperRight = SkColorSpace::MakeICC(data->data(), data->size()); SkColorSpaceTransferFn fn; -- cgit v1.2.3