diff options
| author |  Mike Reed <reed@google.com> | 2017-12-08 21:09:12 +0000 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-12-08 21:09:19 +0000 |
| commit | cca230055921d2df8708ed6f9abcc2d43468dc7f (patch) | |
| tree | de54889d81021104dc9394680903db87994ebfe5 /tests/ImageIsOpaqueTest.cpp | |
| parent | 27372888a5c7698f51069bd5b5beea3e85b66668 (diff) | |
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 <halcanary@google.com>
> Commit-Queue: Hal Canary <halcanary@google.com>
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 <reed@google.com>
Commit-Queue: Mike Reed <reed@google.com>
Diffstat (limited to 'tests/ImageIsOpaqueTest.cpp')
| -rw-r--r-- | tests/ImageIsOpaqueTest.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/tests/ImageIsOpaqueTest.cpp b/tests/ImageIsOpaqueTest.cpp index 38f9b6ae90..9b4837a76f 100644 --- a/tests/ImageIsOpaqueTest.cpp +++ b/tests/ImageIsOpaqueTest.cpp @@ -40,13 +40,14 @@ static void test_flatten(skiatest::Reporter* reporter, const SkImageInfo& info) } DEF_TEST(ImageInfo_flattening, reporter) { - sk_sp<SkData> data = GetResourceAsData("icc_profiles/HP_ZR30w.icc"); + sk_sp<SkData> data = + SkData::MakeFromFileName(GetResourcePath("icc_profiles/HP_ZR30w.icc").c_str()); sk_sp<SkColorSpace> space0 = SkColorSpace::MakeICC(data->data(), data->size()); - data = GetResourceAsData("icc_profiles/HP_Z32x.icc"); + data = SkData::MakeFromFileName( GetResourcePath("icc_profiles/HP_Z32x.icc").c_str()); sk_sp<SkColorSpace> space1 = SkColorSpace::MakeICC(data->data(), data->size()); - data = GetResourceAsData("icc_profiles/upperLeft.icc"); + data = SkData::MakeFromFileName(GetResourcePath("icc_profiles/upperLeft.icc").c_str()); sk_sp<SkColorSpace> space2 = SkColorSpace::MakeICC(data->data(), data->size()); - data = GetResourceAsData("icc_profiles/upperRight.icc"); + data = SkData::MakeFromFileName(GetResourcePath("icc_profiles/upperRight.icc").c_str()); sk_sp<SkColorSpace> space3 = SkColorSpace::MakeICC(data->data(), data->size()); sk_sp<SkColorSpace> spaces[] = { |