diff options
| author |  tfarina <tfarina@chromium.org> | 2014-06-07 20:50:44 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2014-06-07 20:50:44 -0700 |
| commit | 52e4f413ffe2d281f9e90ff2147db08083ffcba7 (patch) | |
| tree | e634f5fa3e03aa48bdb9cdd7a3399b7aca967765 /gm/copyTo4444.cpp | |
| parent | 3d06b48660e389a4e4c060ac8b6b0ba49363c853 (diff) | |
Clean up resourcePath code.
1) Make the implementation of SetResourcePath/GetResourcePath of GM and SkBenchmark match with the one in Test.
2) Make gResourcePath a static pointer to const char and move it inside the classes.
BUG=None
TEST=make tests && out/Debug/tests
make gm && out/Debug/gm
make bench && out/Debug/bench
R=mtklein@google.com
Author: tfarina@chromium.org
Review URL: https://codereview.chromium.org/319473003
Diffstat (limited to 'gm/copyTo4444.cpp')
| -rw-r--r-- | gm/copyTo4444.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/gm/copyTo4444.cpp b/gm/copyTo4444.cpp index 7e2c2798e4..6233301fed 100644 --- a/gm/copyTo4444.cpp +++ b/gm/copyTo4444.cpp @@ -30,8 +30,7 @@ protected: virtual void onDraw(SkCanvas* canvas) { SkBitmap bm, bm4444; - SkString filename = SkOSPath::SkPathJoin( - INHERITED::gResourcePath.c_str(), "mandrill_512.png"); + SkString filename = SkOSPath::SkPathJoin(INHERITED::gResourcePath, "mandrill_512.png"); if (!SkImageDecoder::DecodeFile(filename.c_str(), &bm, SkBitmap::kARGB_8888_Config, SkImageDecoder::kDecodePixels_Mode)) { |