From 93b40594b78ab40170b5a7fa0811fa95ab8fc30f Mon Sep 17 00:00:00 2001 From: "reed@google.com" Date: Fri, 13 Dec 2013 14:18:14 +0000 Subject: Remvoe duplicate impl for SkImageInfo flattening Add onNewLockPixels This reverts commit bb8eff6a70c52b7644391cfd4f4d21bf7294a6bf. BUG= Review URL: https://codereview.chromium.org/111323005 git-svn-id: http://skia.googlecode.com/svn/trunk@12665 2bbb7eff-a529-9590-31e7-b0007b416f81 --- src/image/SkImage_Raster.cpp | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'src/image/SkImage_Raster.cpp') diff --git a/src/image/SkImage_Raster.cpp b/src/image/SkImage_Raster.cpp index a872ae36e5..93de5ea3ab 100644 --- a/src/image/SkImage_Raster.cpp +++ b/src/image/SkImage_Raster.cpp @@ -84,10 +84,8 @@ SkImage* SkImage_Raster::NewEmpty() { SkImage_Raster::SkImage_Raster(const Info& info, SkData* data, size_t rowBytes) : INHERITED(info.fWidth, info.fHeight) { - SkBitmap::Config config = SkImageInfoToBitmapConfig(info); - - fBitmap.setConfig(config, info.fWidth, info.fHeight, rowBytes, info.fAlphaType); - fBitmap.setPixelRef(SkNEW_ARGS(SkDataPixelRef, (data)))->unref(); + fBitmap.setConfig(info, rowBytes); + fBitmap.setPixelRef(SkNEW_ARGS(SkDataPixelRef, (info, data, rowBytes)))->unref(); fBitmap.setImmutable(); } -- cgit v1.2.3