Revert of Revert "Revert of https://codereview.chromium.org/129423002/"

src/image/SkImagePriv.cpp

 /*
  * Copyright 2012 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkImagePriv.h"
 #include "SkCanvas.h"
 #include "SkPicture.h"
@@ skipping 56 matching lines @@
 
 
 SkImage* SkNewImageFromBitmap(const SkBitmap& bm, bool canSharePixelRef) {
     SkImageInfo info;
     if (!bm.asImageInfo(&info)) {
         return NULL;
     }
 
     SkImage* image = NULL;
     if (canSharePixelRef || bm.isImmutable()) {
-        image = SkNewImageFromPixelRef(bm.pixelRef());
+        image = SkNewImageFromPixelRef(info, bm.pixelRef(), bm.rowBytes());
     } else {
         bm.lockPixels();
         if (bm.getPixels()) {
             image = SkImage::NewRasterCopy(info, bm.getPixels(), bm.rowBytes());
         }
         bm.unlockPixels();
     }
     return image;
 }
 
@@ skipping 46 matching lines @@
         canvas->save();
     }
     canvas->concat(matrix);
     if (!paint || !needs_layer(*paint)) {
         canvas->clipRect(tmpSrc);
     }
 
     canvas->drawPicture(*picture);
     canvas->restoreToCount(saveCount);
 }