commit 7fdda6091ca0579e823cc014a000828dd53571e6
author msarett <msarett@google.com> Fri Nov 13 05:56:27 2015 -0800
committer Commit bot <commit-bot@chromium.org> Fri Nov 13 05:56:27 2015 -0800
tree bda42047bab08db2e30ed2a4b6bebae3c3101dfb
parent e0c64c5846b7c2a2d078bbaf954e15cee56fdbe6

Lock pixels again after dummy reset of pixel ref in SkBitmapRegionCodec

This fixes a bug in Android.  We cannot access the pixels after
calling decodeRegion() because the call to lock is missing.

BUG=skia:

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

tools/android/SkBitmapRegionCodec.cpp

diff --git a/tools/android/SkBitmapRegionCodec.cpp b/tools/android/SkBitmapRegionCodec.cpp
index 7c3c247..415b60c 100644
--- a/tools/android/SkBitmapRegionCodec.cpp
+++ b/tools/android/SkBitmapRegionCodec.cpp
@@ -129,6 +129,7 @@
     size_t rowBytes = pr->rowBytes();
     bitmap->setInfo(outInfo, rowBytes);
     bitmap->setPixelRef(pr)->unref();
+    bitmap->lockPixels();
     SkCodec::Result result = fCodec->getAndroidPixels(decodeInfo, dst, rowBytes, &options);
     if (SkCodec::kSuccess != result && SkCodec::kIncompleteInput != result) {
         SkCodecPrintf("Error: Could not get pixels.\n");