commit af3fbfca0ab706230c33e46af620e0044a56c83e
author reed <reed@chromium.org> Sun Oct 04 11:28:36 2015 -0700
committer Commit bot <commit-bot@chromium.org> Sun Oct 04 11:28:36 2015 -0700
tree 779a3187be75dfaa58ac15fcf8b827ed593f038d
parent 588b9cab10d02432faff9f433a1f61293a7f90fe

SkImage doesn't use props, so don't need to store it

BUG=skia:
TBR=bsalomon

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

src/image/SkImage_Raster.cpp

diff --git a/src/image/SkImage_Raster.cpp b/src/image/SkImage_Raster.cpp
index c88e176..b6c62e8 100644
--- a/src/image/SkImage_Raster.cpp
+++ b/src/image/SkImage_Raster.cpp
@@ -63,7 +63,7 @@
         return true;
     }
 
-    SkImage_Raster(const SkImageInfo&, SkData*, size_t rb, SkColorTable*, const SkSurfaceProps*);
+    SkImage_Raster(const SkImageInfo&, SkData*, size_t rb, SkColorTable*);
     virtual ~SkImage_Raster();
 
     bool onReadPixels(const SkImageInfo&, void*, size_t, int srcX, int srcY) const override;
@@ -74,16 +74,15 @@
     SkImage* onNewSubset(const SkIRect&) const override;
 
     // exposed for SkSurface_Raster via SkNewImageFromPixelRef
-    SkImage_Raster(const SkImageInfo&, SkPixelRef*, const SkIPoint& pixelRefOrigin, size_t rowBytes,
-                   const SkSurfaceProps*);
+    SkImage_Raster(const SkImageInfo&, SkPixelRef*, const SkIPoint& origin, size_t rowBytes);
 
     SkPixelRef* getPixelRef() const { return fBitmap.pixelRef(); }
 
     bool isOpaque() const override;
     bool onAsLegacyBitmap(SkBitmap*, LegacyBitmapMode) const override;
 
-    SkImage_Raster(const SkBitmap& bm, const SkSurfaceProps* props)
-        : INHERITED(bm.width(), bm.height(), bm.getGenerationID(), props)
+    SkImage_Raster(const SkBitmap& bm)
+        : INHERITED(bm.width(), bm.height(), bm.getGenerationID())
         , fBitmap(bm)
     {
         if (bm.pixelRef()->isPreLocked()) {
@@ -99,11 +98,7 @@
     }
 
 private:
-    SkImage_Raster() : INHERITED(0, 0, kNeedNewImageUniqueID, nullptr) {
-        fBitmap.setImmutable();
-    }
-
-    SkBitmap    fBitmap;
+    SkBitmap fBitmap;
 
     typedef SkImage_Base INHERITED;
 };
@@ -116,8 +111,8 @@
 }
 
 SkImage_Raster::SkImage_Raster(const Info& info, SkData* data, size_t rowBytes,
-                               SkColorTable* ctable, const SkSurfaceProps* props)
-    : INHERITED(info.width(), info.height(), kNeedNewImageUniqueID, props)
+                               SkColorTable* ctable)
+    : INHERITED(info.width(), info.height(), kNeedNewImageUniqueID)
 {
     data->ref();
     void* addr = const_cast<void*>(data->data());
@@ -128,8 +123,8 @@
 }
 
 SkImage_Raster::SkImage_Raster(const Info& info, SkPixelRef* pr, const SkIPoint& pixelRefOrigin,
-                               size_t rowBytes,  const SkSurfaceProps* props)
-    : INHERITED(info.width(), info.height(), pr->getGenerationID(), props)
+                               size_t rowBytes)
+    : INHERITED(info.width(), info.height(), pr->getGenerationID())
 {
     fBitmap.setInfo(info, rowBytes);
     fBitmap.setPixelRef(pr, pixelRefOrigin);
@@ -223,7 +218,7 @@
 
     // Here we actually make a copy of the caller's pixel data
     SkAutoDataUnref data(SkData::NewWithCopy(pixels, size));
-    return new SkImage_Raster(info, data, rowBytes, ctable, nullptr);
+    return new SkImage_Raster(info, data, rowBytes, ctable);
 }
 
 
@@ -239,7 +234,7 @@
     }
 
     SkColorTable* ctable = nullptr;
-    return new SkImage_Raster(info, data, rowBytes, ctable, nullptr);
+    return new SkImage_Raster(info, data, rowBytes, ctable);
 }
 
 SkImage* SkImage::NewFromRaster(const SkImageInfo& info, const void* pixels, size_t rowBytes,
@@ -251,20 +246,18 @@
 
     SkColorTable* ctable = nullptr;
     SkAutoDataUnref data(SkData::NewWithProc(pixels, size, proc, ctx));
-    return new SkImage_Raster(info, data, rowBytes, ctable, nullptr);
+    return new SkImage_Raster(info, data, rowBytes, ctable);
 }
 
 SkImage* SkNewImageFromPixelRef(const SkImageInfo& info, SkPixelRef* pr,
-                                const SkIPoint& pixelRefOrigin, size_t rowBytes,
-                                const SkSurfaceProps* props) {
+                                const SkIPoint& pixelRefOrigin, size_t rowBytes) {
     if (!SkImage_Raster::ValidArgs(info, rowBytes, false, nullptr)) {
         return nullptr;
     }
-    return new SkImage_Raster(info, pr, pixelRefOrigin, rowBytes, props);
+    return new SkImage_Raster(info, pr, pixelRefOrigin, rowBytes);
 }
 
-SkImage* SkNewImageFromRasterBitmap(const SkBitmap& bm, const SkSurfaceProps* props,
-                                    ForceCopyMode forceCopy) {
+SkImage* SkNewImageFromRasterBitmap(const SkBitmap& bm, ForceCopyMode forceCopy) {
     SkASSERT(nullptr == bm.getTexture());
 
     bool hasColorTable = false;
@@ -285,13 +278,8 @@
             image = SkImage::NewRasterCopy(tmp.info(), tmp.getPixels(), tmp.rowBytes(),
                                            tmp.getColorTable());
         }
-
-        // we don't expose props to NewRasterCopy (need a private vers) so post-init it here
-        if (image && props) {
-            as_IB(image)->initWithProps(*props);
-        }
     } else {
-        image = new SkImage_Raster(bm, props);
+        image = new SkImage_Raster(bm);
     }
     return image;
 }