diff options
| author |  Hal Canary <halcanary@google.com> | 2017-12-08 11:38:47 -0500 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-12-08 19:30:48 +0000 |
| commit | 5093a539def3ae09df324018f2343827009b2e05 (patch) | |
| tree | 0809099fad806dd9a8f00fe0e2dfcd8a958915af /tests/ColorSpaceTest.cpp | |
| parent | 0b1b9c233a338ef26e7593c1423795c8ced53e1d (diff) | |
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>
Diffstat (limited to 'tests/ColorSpaceTest.cpp')
| -rw-r--r-- | tests/ColorSpaceTest.cpp | 18 |
1 files changed, 8 insertions, 10 deletions
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<SkData> monitorData = SkData::MakeFromFileName( - GetResourcePath("icc_profiles/HP_ZR30w.icc").c_str()); + sk_sp<SkData> 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<SkColorSpace> srgb = SkColorSpace::MakeSRGB(); sk_sp<SkColorSpace> adobe = SkColorSpace_Base::MakeNamed(SkColorSpace_Base::kAdobeRGB_Named); - 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> 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<SkColorSpace> 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<SkColorSpace> 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<SkColorSpace> upperRight = SkColorSpace::MakeICC(data->data(), data->size()); SkColorSpaceTransferFn fn; |