From 91359bed48bc006a4319da86eb26db3b2e6d4afb Mon Sep 17 00:00:00 2001 From: mtklein Date: Sun, 8 Jun 2014 07:02:47 -0700 Subject: 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 --- tests/Test.h | 2 -- 1 file changed, 2 deletions(-) (limited to 'tests/Test.h') diff --git a/tests/Test.h b/tests/Test.h index 90d072ef66..4d2cf2b639 100644 --- a/tests/Test.h +++ b/tests/Test.h @@ -73,8 +73,6 @@ namespace skiatest { virtual void onRun(Reporter*) = 0; private: - static const char* gResourcePath; - Reporter* fReporter; SkString fName; bool fPassed; -- cgit v1.2.3