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/GifTest.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'tests/GifTest.cpp') diff --git a/tests/GifTest.cpp b/tests/GifTest.cpp index 5219825f1b..0de5fc586d 100644 --- a/tests/GifTest.cpp +++ b/tests/GifTest.cpp @@ -225,12 +225,12 @@ DEF_TEST(Gif, reporter) { // Regression test for decoding a gif image with sampleSize of 4, which was // previously crashing. DEF_TEST(Gif_Sampled, r) { - auto stream = SkFILEStream::Make(GetResourcePath("images/test640x479.gif").c_str()); - REPORTER_ASSERT(r, stream); - if (!stream) { + auto data = GetResourceAsData("images/test640x479.gif"); + REPORTER_ASSERT(r, data); + if (!data) { return; } - + std::unique_ptr stream(new SkMemoryStream(std::move(data))); std::unique_ptr codec(SkAndroidCodec::MakeFromStream(std::move(stream))); REPORTER_ASSERT(r, codec); if (!codec) { -- cgit v1.2.3