| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright 2012 Google Inc. | 2 * Copyright 2012 Google Inc. |
| 3 * | 3 * |
| 4 * Use of this source code is governed by a BSD-style license that can be | 4 * Use of this source code is governed by a BSD-style license that can be |
| 5 * found in the LICENSE file. | 5 * found in the LICENSE file. |
| 6 */ | 6 */ |
| 7 | 7 |
| 8 #include "SkSurface_Base.h" | 8 #include "SkSurface_Base.h" |
| 9 #include "SkImagePriv.h" | 9 #include "SkImagePriv.h" |
| 10 #include "SkCanvas.h" | 10 #include "SkCanvas.h" |
| (...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 72 if (size > kMaxTotalSize) { | 72 if (size > kMaxTotalSize) { |
| 73 return false; | 73 return false; |
| 74 } | 74 } |
| 75 | 75 |
| 76 return true; | 76 return true; |
| 77 } | 77 } |
| 78 | 78 |
| 79 SkSurface_Raster::SkSurface_Raster(const SkImageInfo& info, void* pixels, size_t
rb) | 79 SkSurface_Raster::SkSurface_Raster(const SkImageInfo& info, void* pixels, size_t
rb) |
| 80 : INHERITED(info) | 80 : INHERITED(info) |
| 81 { | 81 { |
| 82 fBitmap.installPixels(info, pixels, rb); | 82 fBitmap.setConfig(info, rb); |
| 83 fBitmap.setPixels(pixels); |
| 83 fWeOwnThePixels = false; // We are "Direct" | 84 fWeOwnThePixels = false; // We are "Direct" |
| 84 } | 85 } |
| 85 | 86 |
| 86 SkSurface_Raster::SkSurface_Raster(SkPixelRef* pr) | 87 SkSurface_Raster::SkSurface_Raster(SkPixelRef* pr) |
| 87 : INHERITED(pr->info().fWidth, pr->info().fHeight) | 88 : INHERITED(pr->info().fWidth, pr->info().fHeight) |
| 88 { | 89 { |
| 89 const SkImageInfo& info = pr->info(); | 90 const SkImageInfo& info = pr->info(); |
| 90 | 91 |
| 91 fBitmap.setInfo(info, info.minRowBytes()); | 92 fBitmap.setConfig(info, info.minRowBytes()); |
| 92 fBitmap.setPixelRef(pr); | 93 fBitmap.setPixelRef(pr); |
| 93 fWeOwnThePixels = true; | 94 fWeOwnThePixels = true; |
| 94 | 95 |
| 95 if (!info.isOpaque()) { | 96 if (!info.isOpaque()) { |
| 96 fBitmap.eraseColor(SK_ColorTRANSPARENT); | 97 fBitmap.eraseColor(SK_ColorTRANSPARENT); |
| 97 } | 98 } |
| 98 } | 99 } |
| 99 | 100 |
| 100 SkCanvas* SkSurface_Raster::onNewCanvas() { | 101 SkCanvas* SkSurface_Raster::onNewCanvas() { |
| 101 return SkNEW_ARGS(SkCanvas, (fBitmap)); | 102 return SkNEW_ARGS(SkCanvas, (fBitmap)); |
| (...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 151 if (!SkSurface_Raster::Valid(info)) { | 152 if (!SkSurface_Raster::Valid(info)) { |
| 152 return NULL; | 153 return NULL; |
| 153 } | 154 } |
| 154 | 155 |
| 155 SkAutoTUnref<SkPixelRef> pr(SkMallocPixelRef::NewAllocate(info, 0, NULL)); | 156 SkAutoTUnref<SkPixelRef> pr(SkMallocPixelRef::NewAllocate(info, 0, NULL)); |
| 156 if (NULL == pr.get()) { | 157 if (NULL == pr.get()) { |
| 157 return NULL; | 158 return NULL; |
| 158 } | 159 } |
| 159 return SkNEW_ARGS(SkSurface_Raster, (pr)); | 160 return SkNEW_ARGS(SkSurface_Raster, (pr)); |
| 160 } | 161 } |
| OLD | NEW |