| commit | 5f939ab658a228dce34a3b14a545638407150b92 | [log] [tgz] |
|---|---|---|
| author | mtklein <mtklein@chromium.org> | Wed Mar 16 10:28:35 2016 -0700 |
| committer | Commit bot <commit-bot@chromium.org> | Wed Mar 16 10:28:35 2016 -0700 |
| tree | 3eff56fe1aad736cb0e8e07735c06690c5d7d0a4 | |
| parent | af1e21e7ebb155d2505da0eb974c672953dfefef [diff] [blame] |
Use std::unique_ptr. TBR=reed@google.com Committed: https://skia.googlesource.com/skia/+/20c1e3abfc681771f73eb19fde7284196e028940 Committed: https://skia.googlesource.com/skia/+/3dd9ed37c24611af86f0fe374bd3698b63f09450 GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1780933003 Committed: https://skia.googlesource.com/skia/+/2691d76a06e1af6282f8b3a3140cc93361be10c4 Review URL: https://codereview.chromium.org/1780933003
diff --git a/src/core/SkSharedMutex.h b/src/core/SkSharedMutex.h index 840c2d3..21c9f46 100644 --- a/src/core/SkSharedMutex.h +++ b/src/core/SkSharedMutex.h
@@ -14,7 +14,7 @@ #ifdef SK_DEBUG #include "SkMutex.h" - #include "SkUniquePtr.h" + #include <memory> #endif // SK_DEBUG // There are two shared lock implementations one debug the other is high performance. They implement @@ -50,9 +50,9 @@ private: #ifdef SK_DEBUG class ThreadIDSet; - skstd::unique_ptr<ThreadIDSet> fCurrentShared; - skstd::unique_ptr<ThreadIDSet> fWaitingExclusive; - skstd::unique_ptr<ThreadIDSet> fWaitingShared; + std::unique_ptr<ThreadIDSet> fCurrentShared; + std::unique_ptr<ThreadIDSet> fWaitingExclusive; + std::unique_ptr<ThreadIDSet> fWaitingShared; int fSharedQueueSelect{0}; mutable SkMutex fMu; SkSemaphore fSharedQueue[2];