diff options
| author |  reed <reed@google.com> | 2016-05-04 17:12:46 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-05-04 17:12:46 -0700 |
| commit | 086eea93b1f8253420c233c33cdabc0e74b08091 (patch) | |
| tree | 34a4f19d22263c547d2a53734caf179797fb9b53 /src/lazy | |
| parent | 5e56cfd3fa1041dbb83899844fb92fa9a2ef1009 (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 'src/lazy')
| -rw-r--r-- | src/lazy/SkDiscardableMemoryPool.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/lazy/SkDiscardableMemoryPool.cpp b/src/lazy/SkDiscardableMemoryPool.cpp index da7db52958..d6753def9d 100644 --- a/src/lazy/SkDiscardableMemoryPool.cpp +++ b/src/lazy/SkDiscardableMemoryPool.cpp @@ -244,7 +244,7 @@ SkDiscardableMemoryPool* SkDiscardableMemoryPool::Create(size_t size, SkMutex* m return new DiscardableMemoryPool(size, mutex); } -static SkMutex gMutex; +SK_DECLARE_STATIC_MUTEX(gMutex); SkDiscardableMemoryPool* SkGetGlobalDiscardableMemoryPool() { static SkOnce once; |