commit 3c834324d9a53659999ea496124a3e41001c5f1b
author reed <reed@chromium.org> Fri Jun 12 07:09:59 2015 -0700
committer Commit bot <commit-bot@chromium.org> Fri Jun 12 07:09:59 2015 -0700
tree cc6a6a8fce3812cb36d2d49a8204049ae07e4a24
parent 74d614a0448f916963468afa756d922f651c9d30

change Resize to take pixmap for src

BUG=skia:

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

src/core/SkBitmapController.cpp

diff --git a/src/core/SkBitmapController.cpp b/src/core/SkBitmapController.cpp
index dd7eb6f..c8164a3 100644
--- a/src/core/SkBitmapController.cpp
+++ b/src/core/SkBitmapController.cpp
@@ -122,11 +122,12 @@
     SkScalar roundedDestHeight = SkScalarRoundToScalar(trueDestHeight);
     
     if (!SkBitmapCache::Find(origBitmap, roundedDestWidth, roundedDestHeight, &fResultBitmap)) {
-        if (!SkBitmapScaler::Resize(&fResultBitmap,
-                                    origBitmap,
-                                    SkBitmapScaler::RESIZE_BEST,
-                                    roundedDestWidth,
-                                    roundedDestHeight,
+        SkAutoPixmapUnlock src;
+        if (!origBitmap.requestLock(&src)) {
+            return false;
+        }
+        if (!SkBitmapScaler::Resize(&fResultBitmap, src.pixmap(), SkBitmapScaler::RESIZE_BEST,
+                                    roundedDestWidth, roundedDestHeight,
                                     SkResourceCache::GetAllocator())) {
             return false; // we failed to create fScaledBitmap
         }