commit 5617900063f69754de62b8b12d32f6e36df14104
author reed <reed@chromium.org> Tue Jul 07 06:11:19 2015 -0700
committer Commit bot <commit-bot@chromium.org> Tue Jul 07 06:11:20 2015 -0700
tree 07064e2e25565b7b6e4ee2b953ea9b2cde804091
parent 6f29a3c92c976017608a626d0449dda8b603277a

add SkImage::NewFromBitmap

BUG=skia:

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

src/image/SkImage_Raster.cpp

diff --git a/src/image/SkImage_Raster.cpp b/src/image/SkImage_Raster.cpp
index 0316d53..250e362 100644
--- a/src/image/SkImage_Raster.cpp
+++ b/src/image/SkImage_Raster.cpp
@@ -227,21 +227,24 @@
     return SkNEW_ARGS(SkImage_Raster, (info, pr, pixelRefOrigin, rowBytes, props));
 }
 
-SkImage* SkNewImageFromBitmap(const SkBitmap& bm, bool canSharePixelRef,
-                              const SkSurfaceProps* props) {
+SkImage* SkNewImageFromRasterBitmap(const SkBitmap& bm, bool forceSharePixelRef,
+                                    const SkSurfaceProps* props) {
+    SkASSERT(NULL == bm.getTexture());
+
     if (!SkImage_Raster::ValidArgs(bm.info(), bm.rowBytes(), NULL, NULL)) {
         return NULL;
     }
 
     SkImage* image = NULL;
-    if (canSharePixelRef || bm.isImmutable()) {
+    if (forceSharePixelRef || bm.isImmutable()) {
         image = SkNEW_ARGS(SkImage_Raster, (bm, props));
     } else {
-        bm.lockPixels();
-        if (bm.getPixels()) {
-            image = SkImage::NewRasterCopy(bm.info(), bm.getPixels(), bm.rowBytes());
+        SkBitmap tmp(bm);
+        tmp.lockPixels();
+        if (tmp.getPixels()) {
+            image = SkImage::NewRasterCopy(tmp.info(), tmp.getPixels(), tmp.rowBytes(),
+                                           tmp.getColorTable());
         }
-        bm.unlockPixels();
 
         // we don't expose props to NewRasterCopy (need a private vers) so post-init it here
         if (image && props) {