commit 880914c35c8f7fc2e9c57134134c883baf66e538
author tfarina <tfarina@chromium.org> Mon Jun 09 12:05:34 2014 -0700
committer Commit bot <commit-bot@chromium.org> Mon Jun 09 12:05:34 2014 -0700
tree 5170dfdcc9002502d25fa5b45723e7a04cd96c3d
parent 4d517fdbb145cb95e5e935470df331e1b6667cfc

Reland "Clean up Test's resourcePath code."

This relands commit 91359bed48bc006a4319da86eb26db3b2e6d4afb (Clean up
Test's resourcePath code."

BUG=None
TEST=make dm && out/Debug/dm
R=mtklein@google.com

Author: tfarina@chromium.org

Review URL: https://codereview.chromium.org/321723002

bench/ETCBitmapBench.cpp

diff --git a/bench/ETCBitmapBench.cpp b/bench/ETCBitmapBench.cpp
index 4b9cd6e..e9aee76 100644
--- a/bench/ETCBitmapBench.cpp
+++ b/bench/ETCBitmapBench.cpp
@@ -89,8 +89,9 @@
 
 private:
     SkData *loadPKM() {
-        SkString filename = SkOSPath::SkPathJoin(
-            INHERITED::GetResourcePath().c_str(), "mandrill_128.pkm");
+        SkString resourcePath = GetResourcePath();
+        SkString filename = SkOSPath::SkPathJoin(resourcePath.c_str(),
+                                                 "mandrill_128.pkm");
 
         // Expand the data
         SkAutoDataUnref fileData(SkData::NewFromFileName(filename.c_str()));