commit a3264e53ee3f3c5d6a2c813df7e44b5b96d207f2
author commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> Fri May 30 13:26:10 2014 +0000
committer commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> Fri May 30 13:26:10 2014 +0000
tree 5a95db31ba21ba5f0354b3e9e622a046fe6e04c4
parent 16fdbd3141f23a348e4b9f706e77307a947bd5a2

Revert "Revert of setConfig -> setInfo (https://codereview.chromium.org/308683005/)"

This reverts commit eecaea4148805834f223681f70b6488ceba12d09.

R=robertphillips@google.com, scroggo@google.com

Author: reed@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@14989 2bbb7eff-a529-9590-31e7-b0007b416f81

src/image/SkSurface_Raster.cpp

diff --git a/src/image/SkSurface_Raster.cpp b/src/image/SkSurface_Raster.cpp
index 7419737..0b6efe1 100644
--- a/src/image/SkSurface_Raster.cpp
+++ b/src/image/SkSurface_Raster.cpp
@@ -79,8 +79,7 @@
 SkSurface_Raster::SkSurface_Raster(const SkImageInfo& info, void* pixels, size_t rb)
     : INHERITED(info)
 {
-    fBitmap.setConfig(info, rb);
-    fBitmap.setPixels(pixels);
+    fBitmap.installPixels(info, pixels, rb);
     fWeOwnThePixels = false;    // We are "Direct"
 }
 
@@ -89,7 +88,7 @@
 {
     const SkImageInfo& info = pr->info();
 
-    fBitmap.setConfig(info, info.minRowBytes());
+    fBitmap.setInfo(info, info.minRowBytes());
     fBitmap.setPixelRef(pr);
     fWeOwnThePixels = true;