Revert of Revert of remvoe duplicate impl for SkImageInfo flattening

Revert of https://codereview.chromium.org/113193003/
Reason for revert: The wrong CL was reverted accidently

TBR=reed@google.com
NOTREECHECKS=true
NOTRY=true

[commit-bot: I haz the power, 2013-12-11 21:07:25]

CQ is trying da patch. Follow status at
https://skia-tree-status.appspot.com/cq/rmistry@google.com/113233002/1

[rmistry, 2013-12-11 21:07:30]

Created Revert of Revert of remvoe duplicate impl for SkImageInfo flattening

[commit-bot: I haz the power, 2013-12-11 21:07:38]

Failed to apply patch for src/image/SkImage_Raster.cpp:
While running patch -p1 --forward --force --no-backup-if-mismatch;
  patching file src/image/SkImage_Raster.cpp
  Hunk #1 FAILED at 84.
  1 out of 1 hunk FAILED -- saving rejects to file
src/image/SkImage_Raster.cpp.rej

Patch:       src/image/SkImage_Raster.cpp
Index: src/image/SkImage_Raster.cpp
diff --git a/src/image/SkImage_Raster.cpp b/src/image/SkImage_Raster.cpp
index
a872ae36e52d3aad65b23fffa280544876b252d5..93de5ea3abb1765cd03d26a2855e93bac20e67dd
100644
--- a/src/image/SkImage_Raster.cpp
+++ b/src/image/SkImage_Raster.cpp
@@ -84,10 +84,8 @@
 
 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();
 }