From 5e56cfd3fa1041dbb83899844fb92fa9a2ef1009 Mon Sep 17 00:00:00 2001 From: mtklein Date: Wed, 4 May 2016 15:21:12 -0700 Subject: 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 --- tests/PathOpsExtendedTest.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'tests/PathOpsExtendedTest.cpp') 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 -- cgit v1.2.3