diff options
| author |  reed@google.com <reed@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2014-01-13 20:28:50 +0000 |
|---|---|---|
| committer | reed@google.com <reed@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2014-01-13 20:28:50 +0000 |
| commit | f0b56e74485d59465194b21f89fa3bc3a7962ac6 (patch) | |
| tree | 7c8922e9ebead92d3d1ef93bbcd378c4eb3b05fb /src/image/SkSurface_Raster.cpp | |
| parent | 9b06ba4c91484d09565ff4a572d8c5af15dd429e (diff) | |
Revert "Revert of https://codereview.chromium.org/129423002/"
fixed new api references in unit tests
This reverts commit ffc0058e1fbcbd69617e1f41b2dce5b5765ff99e.
BUG=
Review URL: https://codereview.chromium.org/132643007
git-svn-id: http://skia.googlecode.com/svn/trunk@13057 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, 3 insertions, 6 deletions
diff --git a/src/image/SkSurface_Raster.cpp b/src/image/SkSurface_Raster.cpp index 1b218eb446..7010b5fb2a 100644 --- a/src/image/SkSurface_Raster.cpp +++ b/src/image/SkSurface_Raster.cpp @@ -85,15 +85,12 @@ SkSurface_Raster::SkSurface_Raster(const SkImageInfo& info, void* pixels, size_t } SkSurface_Raster::SkSurface_Raster(SkPixelRef* pr) - : INHERITED(pr->info().fWidth, pr->info().fHeight) + : INHERITED(pr->info()) { - const SkImageInfo& info = pr->info(); - - fBitmap.setConfig(info, info.minRowBytes()); - fBitmap.setPixelRef(pr); + fBitmap.installPixelRef(pr); fWeOwnThePixels = true; - if (!info.isOpaque()) { + if (!pr->info().isOpaque()) { fBitmap.eraseColor(SK_ColorTRANSPARENT); } } |