Upstream version 9.38.198.0

[platform/framework/web/crosswalk.git] / src / third_party / skia / tests / KtxTest.cpp

diff --git a/src/third_party/skia/tests/KtxTest.cpp b/src/third_party/skia/tests/KtxTest.cpp
index e9c4217..bddd09a 100644 (file)
--- a/src/third_party/skia/tests/KtxTest.cpp
+++ b/src/third_party/skia/tests/KtxTest.cpp
@@ -141,13 +141,15 @@ 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);
+    if (NULL == fileData) {
+        return;
+    }
 
     bool installDiscardablePixelRefSuccess =
         SkInstallDiscardablePixelRef(
@@ -161,7 +163,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));
 }