diff options
| author |  mtklein <mtklein@google.com> | 2014-06-08 07:02:47 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2014-06-08 07:02:47 -0700 |
| commit | 91359bed48bc006a4319da86eb26db3b2e6d4afb (patch) | |
| tree | 923d1ac57009191855db0b4a49b487d9bf39a283 /gm/factory.cpp | |
| parent | 643b8bd6617e333f7a970a57ad9166f3d6675d1a (diff) | |
Revert of Clean up Test's resourcePath code. (https://codereview.chromium.org/319473003/)
Reason for revert:
Some benchmarks are written in a way that makes this change unsafe (e.g. const char* resPath = GetResourcePath().c_str(); in SkipZeroesBench) and Valgrind and ASAN caught that. We can try again after a more careful cleanup of GetResourcePath().
Original issue's description:
> 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
>
> Committed: https://skia.googlesource.com/skia/+/52e4f413ffe2d281f9e90ff2147db08083ffcba7
R=tfarina@chromium.org
TBR=tfarina@chromium.org
NOTREECHECKS=true
NOTRY=true
BUG=None
Author: mtklein@google.com
Review URL: https://codereview.chromium.org/320733002
Diffstat (limited to 'gm/factory.cpp')
| -rw-r--r-- | gm/factory.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/gm/factory.cpp b/gm/factory.cpp index aa643a2c5b..bd79c9d81e 100644 --- a/gm/factory.cpp +++ b/gm/factory.cpp @@ -28,7 +28,8 @@ public: protected: virtual void onOnceBeforeDraw() SK_OVERRIDE { // Copyright-free file from http://openclipart.org/detail/29213/paper-plane-by-ddoo - SkString filename = SkOSPath::SkPathJoin(INHERITED::gResourcePath, "plane.png"); + SkString filename = SkOSPath::SkPathJoin(INHERITED::gResourcePath.c_str(), + "plane.png"); SkAutoDataUnref data(SkData::NewFromFileName(filename.c_str())); if (NULL != data.get()) { // Create a cache which will boot the pixels out anytime the |