Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(140)

Unified Diff: tests/KtxTest.cpp

Issue 351133003: Cleanup usage of GetResourcePath() after commit bcbc1788b478b1e54079318ad073e8490aa66fae. (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Created 6 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « tests/ImageDecodingTest.cpp ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: tests/KtxTest.cpp
diff --git a/tests/KtxTest.cpp b/tests/KtxTest.cpp
index e9c4217eadfbe56f9fd09f50b97adcf72ff6d7c1..83a3546bec18281f134a0433dcaebb9704b9dad7 100644
--- a/tests/KtxTest.cpp
+++ b/tests/KtxTest.cpp
@@ -141,12 +141,11 @@ DEF_TEST(KtxReadUnpremul, reporter) {
* the PKM to the KTX should produce an identical KTX to the one we have on file)
*/
DEF_TEST(KtxReexportPKM, reporter) {
- SkString resourcePath = GetResourcePath();
- SkString filename = SkOSPath::SkPathJoin(resourcePath.c_str(), "mandrill_128.pkm");
+ SkString pkmFilename = GetResourcePath("mandrill_128.pkm");
// Load PKM file into a bitmap
SkBitmap etcBitmap;
- SkAutoTUnref<SkData> fileData(SkData::NewFromFileName(filename.c_str()));
+ SkAutoTUnref<SkData> fileData(SkData::NewFromFileName(pkmFilename.c_str()));
REPORTER_ASSERT(reporter, NULL != fileData);
bool installDiscardablePixelRefSuccess =
@@ -161,7 +160,7 @@ DEF_TEST(KtxReexportPKM, reporter) {
REPORTER_ASSERT(reporter, NULL != ktxDataPtr);
// See is this data is identical to data in existing ktx file.
- SkString ktxFilename = SkOSPath::SkPathJoin(resourcePath.c_str(), "mandrill_128.ktx");
+ SkString ktxFilename = GetResourcePath("mandrill_128.ktx");
SkAutoDataUnref oldKtxData(SkData::NewFromFileName(ktxFilename.c_str()));
REPORTER_ASSERT(reporter, oldKtxData->equals(newKtxData));
}
« no previous file with comments | « tests/ImageDecodingTest.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698