diff options
| author |  commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2014-01-13 20:39:14 +0000 |
|---|---|---|
| committer | commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2014-01-13 20:39:14 +0000 |
| commit | e13af711d4ff9031c9ed3054a4c33a56a0c62e1f (patch) | |
| tree | 6ffdbe491bde75147efead8c9d21b5d6ebae045e /src/image/SkSurface_Raster.cpp | |
| parent | f0b56e74485d59465194b21f89fa3bc3a7962ac6 (diff) | |
Reason for revert: broken tests
TBR=
NOTREECHECKS=true
NOTRY=true
BUG=
Author: reed@google.com
Review URL: https://codereview.chromium.org/134843008
git-svn-id: http://skia.googlecode.com/svn/trunk@13058 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'src/image/SkSurface_Raster.cpp')
| -rw-r--r-- | src/image/SkSurface_Raster.cpp | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/image/SkSurface_Raster.cpp b/src/image/SkSurface_Raster.cpp index 7010b5fb2a..1b218eb446 100644 --- a/src/image/SkSurface_Raster.cpp +++ b/src/image/SkSurface_Raster.cpp @@ -85,12 +85,15 @@ SkSurface_Raster::SkSurface_Raster(const SkImageInfo& info, void* pixels, size_t } SkSurface_Raster::SkSurface_Raster(SkPixelRef* pr) - : INHERITED(pr->info()) + : INHERITED(pr->info().fWidth, pr->info().fHeight) { - fBitmap.installPixelRef(pr); + const SkImageInfo& info = pr->info(); + + fBitmap.setConfig(info, info.minRowBytes()); + fBitmap.setPixelRef(pr); fWeOwnThePixels = true; - if (!pr->info().isOpaque()) { + if (!info.isOpaque()) { fBitmap.eraseColor(SK_ColorTRANSPARENT); } } |