commit dadfc245cc9a0279ff7b73da3344f2ca5d139907
author mtklein <mtklein@chromium.org> Wed Dec 02 10:46:18 2015 -0800
committer Commit bot <commit-bot@chromium.org> Wed Dec 02 10:46:18 2015 -0800
tree 9c6bf9da62a5e71ca1242e95b6031f52ee0642e8
parent 954cbc15b39e1b45c6244f2811b5ac6be6e412fd

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,Test-iOS-Clang-iPad4-GPU-SGX554-Arm7-Release-Trybot

Committed: https://skia.googlesource.com/skia/+/06189155d987db5c7e69015f6ea87c2168d6a065

Committed: https://skia.googlesource.com/skia/+/70e8dfca4a7f5bce97b8021a6e378c4828b09c8c

Review URL: https://codereview.chromium.org/1436033003

src/android/SkBitmapRegionDecoder.cpp

diff --git a/src/android/SkBitmapRegionDecoder.cpp b/src/android/SkBitmapRegionDecoder.cpp
index a153282..f11bf40 100644
--- a/src/android/SkBitmapRegionDecoder.cpp
+++ b/src/android/SkBitmapRegionDecoder.cpp
@@ -54,7 +54,7 @@
                     SkAndroidCodec::NewFromStream(streamDeleter.detach());
             if (nullptr == codec) {
                 SkCodecPrintf("Error: Failed to create codec.\n");
-                return NULL;
+                return nullptr;
             }
 
             SkEncodedFormat format = codec->getEncodedFormat();