aboutsummaryrefslogtreecommitdiffhomepage
path: root/include
diff options
context:
space:
mode:
authorGravatar reed <reed@google.com>2016-05-04 17:12:46 -0700
committerGravatar Commit bot <commit-bot@chromium.org>2016-05-04 17:12:46 -0700
commit086eea93b1f8253420c233c33cdabc0e74b08091 (patch)
tree34a4f19d22263c547d2a53734caf179797fb9b53 /include
parent5e56cfd3fa1041dbb83899844fb92fa9a2ef1009 (diff)
Revert of SK_DECLARE_STATIC_MUTEX -> static SkMutex (patchset #1 id:1 of https://codereview.chromium.org/1948193002/ )
Reason for revert: broken the Mac and Linux builders, e.g.: https://build.chromium.org/p/chromium/builders/Mac/builds/15151 https://build.chromium.org/p/chromium/builders/Linux%20x64/builds/19052 Original issue's description: > 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 > > Committed: https://skia.googlesource.com/skia/+/5e56cfd3fa1041dbb83899844fb92fa9a2ef1009 TBR=mtklein@google.com,mtklein@chromium.org # Skipping CQ checks because original CL landed less than 1 days ago. NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=skia: Review-Url: https://codereview.chromium.org/1945353003
Diffstat (limited to 'include')
-rw-r--r--include/private/SkMutex.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/include/private/SkMutex.h b/include/private/SkMutex.h
index 503b1e8efc..b9af00f8a8 100644
--- a/include/private/SkMutex.h
+++ b/include/private/SkMutex.h
@@ -12,6 +12,9 @@
#include "../private/SkThreadID.h"
#include "SkTypes.h"
+// TODO: no need for this anymore.
+#define SK_DECLARE_STATIC_MUTEX(name) static SkMutex name;
+
class SkMutex {
public:
constexpr SkMutex() = default;