diff options
| author |  mtklein <mtklein@chromium.org> | 2015-11-30 07:07:01 -0800 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2015-11-30 07:07:02 -0800 |
| commit | 70e8dfca4a7f5bce97b8021a6e378c4828b09c8c (patch) | |
| tree | 35fdb0576d471c7e86c6952a2521c2a535459d67 /src | |
| parent | b9a1e34362c282e21d9e99edededf987a48e98de (diff) | |
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;client.skia:Perf-Mac10.9-Clang-MacMini6.2-CPU-AVX-x86_64-Release-Trybot
Committed: https://skia.googlesource.com/skia/+/06189155d987db5c7e69015f6ea87c2168d6a065
Review URL: https://codereview.chromium.org/1436033003
Diffstat (limited to 'src')
| -rw-r--r-- | src/android/SkBitmapRegionDecoder.cpp | 2 | ||||
| -rw-r--r-- | src/core/SkSharedMutex.h | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/android/SkBitmapRegionDecoder.cpp b/src/android/SkBitmapRegionDecoder.cpp index a153282b09..f11bf40d74 100644 --- a/src/android/SkBitmapRegionDecoder.cpp +++ b/src/android/SkBitmapRegionDecoder.cpp @@ -54,7 +54,7 @@ SkBitmapRegionDecoder* SkBitmapRegionDecoder::Create( SkAndroidCodec::NewFromStream(streamDeleter.detach()); if (nullptr == codec) { SkCodecPrintf("Error: Failed to create codec.\n"); - return NULL; + return nullptr; } SkEncodedFormat format = codec->getEncodedFormat(); diff --git a/src/core/SkSharedMutex.h b/src/core/SkSharedMutex.h index 840c2d36ad..21c9f46d64 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 @@ public: 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]; |