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/ImageIsOpaqueTest.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/ImageIsOpaqueTest.cpp')
| -rw-r--r-- | tests/ImageIsOpaqueTest.cpp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/tests/ImageIsOpaqueTest.cpp b/tests/ImageIsOpaqueTest.cpp index 9b4837a76f..38f9b6ae90 100644 --- a/tests/ImageIsOpaqueTest.cpp +++ b/tests/ImageIsOpaqueTest.cpp @@ -40,14 +40,13 @@ static void test_flatten(skiatest::Reporter* reporter, const SkImageInfo& info) } DEF_TEST(ImageInfo_flattening, reporter) { - 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> space0 = 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> space1 = 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> space2 = 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> space3 = SkColorSpace::MakeICC(data->data(), data->size()); sk_sp<SkColorSpace> spaces[] = { |