Make SkNewImageFromBitmap take pixel ref origin into account

src/image/SkImagePriv.cpp

Index: src/image/SkImagePriv.cpp
diff --git a/src/image/SkImagePriv.cpp b/src/image/SkImagePriv.cpp
deleted file mode 100644
index ad7b154e7657f351b92bc7f1d453f452c5fb7e8a..0000000000000000000000000000000000000000
--- a/src/image/SkImagePriv.cpp
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * 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 "SkImage_Base.h"
-#include "SkCanvas.h"
-#include "SkPicture.h"
-
-SkImage* SkNewImageFromBitmap(const SkBitmap& bm, bool canSharePixelRef,
-                              const SkSurfaceProps* props) {
-    const SkImageInfo info = bm.info();
-    if (kUnknown_SkColorType == info.colorType()) {
-        return NULL;
-    }
-
-    SkImage* image = NULL;
-    if (canSharePixelRef || bm.isImmutable()) {
-        image = SkNewImageFromPixelRef(info, bm.pixelRef(), bm.rowBytes(), props);
-    } else {
-        bm.lockPixels();
-        if (bm.getPixels()) {
-            image = SkImage::NewRasterCopy(info, bm.getPixels(), bm.rowBytes());
-        }
-        bm.unlockPixels();
-
-        // we don't expose props to NewRasterCopy (need a private vers) so post-init it here
-        if (image && props) {
-            as_IB(image)->initWithProps(*props);
-        }
-    }
-    return image;
-}