diff options
author | mtklein <mtklein@chromium.org> | 2016-05-04 15:21:12 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2016-05-04 15:21:12 -0700 |
commit | 5e56cfd3fa1041dbb83899844fb92fa9a2ef1009 (patch) | |
tree | f272195cafb5a417284f9e28fa4155454c237938 /tests/PathOpsExtendedTest.cpp | |
parent | 9bd3fc7fa9bb7cad050bd619aa93d4c48ebb5c02 (diff) |
SK_DECLARE_STATIC_MUTEX -> static SkMutex
There's no need to use a macro to declare static SkMutexes any more
(and there's likewise no need to restrict them to global scope).
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1948193002
Review-Url: https://codereview.chromium.org/1948193002
Diffstat (limited to 'tests/PathOpsExtendedTest.cpp')
-rw-r--r-- | tests/PathOpsExtendedTest.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/PathOpsExtendedTest.cpp b/tests/PathOpsExtendedTest.cpp index c96cbcdae5..27baa8c4b8 100644 --- a/tests/PathOpsExtendedTest.cpp +++ b/tests/PathOpsExtendedTest.cpp @@ -331,7 +331,7 @@ void ShowTestArray(const char* testName) { } } -SK_DECLARE_STATIC_MUTEX(compareDebugOut3); +static SkMutex compareDebugOut3; static int comparePaths(skiatest::Reporter* reporter, const char* testName, const SkPath& one, const SkPath& scaledOne, const SkPath& two, const SkPath& scaledTwo, SkBitmap& bitmap, @@ -419,7 +419,7 @@ static void outputToStream(const char* pathStr, const char* pathPrefix, const ch outFile.flush(); } -SK_DECLARE_STATIC_MUTEX(simplifyDebugOut); +static SkMutex simplifyDebugOut; bool testSimplify(SkPath& path, bool useXor, SkPath& out, PathOpsThreadState& state, const char* pathStr) { @@ -578,7 +578,7 @@ bool testPathFailOp(skiatest::Reporter* reporter, const SkPath& a, const SkPath& return true; } -SK_DECLARE_STATIC_MUTEX(gMutex); +static SkMutex gMutex; void initializeTests(skiatest::Reporter* reporter, const char* test) { #if 0 // doesn't work yet |