diff options
| author |  mtklein <mtklein@google.com> | 2015-11-23 09:19:37 -0800 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2015-11-23 09:19:37 -0800 |
| commit | dfd7d48ced44026aafca71ecb5f0138af8125b94 (patch) | |
| tree | a4ba8888c8d044487221f4a10cd21d389b591c6c /src/core/SkSharedMutex.h | |
| parent | 06189155d987db5c7e69015f6ea87c2168d6a065 (diff) | |
Revert of skstd -> std for unique_ptr (patchset #16 id:300001 of https://codereview.chromium.org/1436033003/ )
Reason for revert:
Perf-Mac10.9-Clang-MacMini6.2-CPU-AVX-x86_64-Release has not updated yet.
Original issue's description:
> skstd -> std for unique_ptr
>
> TBR=reed@google.com
> No public API changes.
>
> BUG=skia:4564
>
> Committed: https://skia.googlesource.com/skia/+/755c553c17b82bb5de3d9cc8d3b2a866ff9e9e50
>
> CQ_EXTRA_TRYBOTS=client.skia.compile:Build-Mac10.9-Clang-x86_64-Release-CMake-Trybot,Build-Ubuntu-GCC-x86_64-Debug-CrOS_Link-Trybot
>
> Committed: https://skia.googlesource.com/skia/+/06189155d987db5c7e69015f6ea87c2168d6a065
TBR=bungeman@google.com,mtklein@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=skia:4564
Review URL: https://codereview.chromium.org/1467333002
Diffstat (limited to 'src/core/SkSharedMutex.h')
| -rw-r--r-- | src/core/SkSharedMutex.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/core/SkSharedMutex.h b/src/core/SkSharedMutex.h index 21c9f46d64..840c2d36ad 100644 --- a/src/core/SkSharedMutex.h +++ b/src/core/SkSharedMutex.h @@ -14,7 +14,7 @@ #ifdef SK_DEBUG #include "SkMutex.h" - #include <memory> + #include "SkUniquePtr.h" #endif // SK_DEBUG // There are two shared lock implementations one debug the other is high performance. They implement @@ -50,9 +50,9 @@ public: private: #ifdef SK_DEBUG class ThreadIDSet; - std::unique_ptr<ThreadIDSet> fCurrentShared; - std::unique_ptr<ThreadIDSet> fWaitingExclusive; - std::unique_ptr<ThreadIDSet> fWaitingShared; + skstd::unique_ptr<ThreadIDSet> fCurrentShared; + skstd::unique_ptr<ThreadIDSet> fWaitingExclusive; + skstd::unique_ptr<ThreadIDSet> fWaitingShared; int fSharedQueueSelect{0}; mutable SkMutex fMu; SkSemaphore fSharedQueue[2]; |