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 --- dm/DMJsonWriter.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'dm/DMJsonWriter.cpp') diff --git a/dm/DMJsonWriter.cpp b/dm/DMJsonWriter.cpp index 7bd8acd6d2..652c70b8cc 100644 --- a/dm/DMJsonWriter.cpp +++ b/dm/DMJsonWriter.cpp @@ -19,7 +19,7 @@ namespace DM { SkTArray gBitmapResults; -SK_DECLARE_STATIC_MUTEX(gBitmapResultLock); +static SkMutex gBitmapResultLock; void JsonWriter::AddBitmapResult(const BitmapResult& result) { SkAutoMutexAcquire lock(&gBitmapResultLock); @@ -27,7 +27,7 @@ void JsonWriter::AddBitmapResult(const BitmapResult& result) { } SkTArray gFailures; -SK_DECLARE_STATIC_MUTEX(gFailureLock); +static SkMutex gFailureLock; void JsonWriter::AddTestFailure(const skiatest::Failure& failure) { SkAutoMutexAcquire lock(gFailureLock); -- cgit v1.2.3