Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(256)

Unified Diff: src/image/SkSurface_Raster.cpp

Issue 302053002: Revert of setConfig -> setInfo (Closed) Base URL: https://skia.googlecode.com/svn/trunk
Patch Set: Created 6 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « src/image/SkImage_Raster.cpp ('k') | src/images/SkImageDecoder_libwebp.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/image/SkSurface_Raster.cpp
diff --git a/src/image/SkSurface_Raster.cpp b/src/image/SkSurface_Raster.cpp
index 0b6efe19fe67b23870dd6596bbd808bd261173e3..74197379ce5ee9d0ca8cf9118b44986c9dd362ad 100644
--- a/src/image/SkSurface_Raster.cpp
+++ b/src/image/SkSurface_Raster.cpp
@@ -79,7 +79,8 @@
SkSurface_Raster::SkSurface_Raster(const SkImageInfo& info, void* pixels, size_t rb)
: INHERITED(info)
{
- fBitmap.installPixels(info, pixels, rb);
+ fBitmap.setConfig(info, rb);
+ fBitmap.setPixels(pixels);
fWeOwnThePixels = false; // We are "Direct"
}
@@ -88,7 +89,7 @@
{
const SkImageInfo& info = pr->info();
- fBitmap.setInfo(info, info.minRowBytes());
+ fBitmap.setConfig(info, info.minRowBytes());
fBitmap.setPixelRef(pr);
fWeOwnThePixels = true;
« no previous file with comments | « src/image/SkImage_Raster.cpp ('k') | src/images/SkImageDecoder_libwebp.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698