summaryrefslogtreecommitdiff
path: root/image/SkImage_Raster.cpp
diff options
context:
space:
mode:
authorreed@google.com <reed@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81>2013-12-13 19:45:58 +0000
committerreed@google.com <reed@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81>2013-12-13 19:45:58 +0000
commitc2062d0e1bd6b258229669463ab5ce7020780c8a (patch)
tree6d6891571b5b8503b79c3f2594be27787f72c965 /image/SkImage_Raster.cpp
parenta40953e4f4183928b55379b19efacdd805e2da2a (diff)
downloadsrc-c2062d0e1bd6b258229669463ab5ce7020780c8a.tar.gz
Update all callsites to use info for pixelrefs
#define SK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR in chrome to keep old API signature (for now) BUG= R=scroggo@google.com Review URL: https://codereview.chromium.org/100723005 git-svn-id: http://skia.googlecode.com/svn/trunk/src@12677 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'image/SkImage_Raster.cpp')
-rw-r--r--image/SkImage_Raster.cpp6
1 files changed, 2 insertions, 4 deletions
diff --git a/image/SkImage_Raster.cpp b/image/SkImage_Raster.cpp
index a872ae36..807c19e7 100644
--- a/image/SkImage_Raster.cpp
+++ b/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)))->unref();
fBitmap.setImmutable();
}