| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright 2015 Google Inc. | 2 * Copyright 2015 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 "SkBitmapProvider.h" | 8 #include "SkBitmapProvider.h" |
| 9 #include "SkImage_Base.h" | 9 #include "SkImage_Base.h" |
| 10 #include "SkPixelRef.h" | 10 #include "SkPixelRef.h" |
| (...skipping 27 matching lines...) Expand all Loading... |
| 38 if (!fBitmap.getColorTable()) { | 38 if (!fBitmap.getColorTable()) { |
| 39 return false; | 39 return false; |
| 40 } | 40 } |
| 41 } | 41 } |
| 42 } | 42 } |
| 43 return true; | 43 return true; |
| 44 } | 44 } |
| 45 | 45 |
| 46 SkImageInfo SkBitmapProvider::info() const { | 46 SkImageInfo SkBitmapProvider::info() const { |
| 47 if (fImage) { | 47 if (fImage) { |
| 48 SkAlphaType at = fImage->isOpaque() ? kOpaque_SkAlphaType : kPremul_SkAl
phaType; | 48 return as_IB(fImage)->onImageInfo(); |
| 49 return SkImageInfo::MakeN32(fImage->width(), fImage->height(), at); | |
| 50 } else { | 49 } else { |
| 51 return fBitmap.info(); | 50 return fBitmap.info(); |
| 52 } | 51 } |
| 53 } | 52 } |
| 54 | 53 |
| 55 bool SkBitmapProvider::isVolatile() const { | 54 bool SkBitmapProvider::isVolatile() const { |
| 56 if (fImage) { | 55 if (fImage) { |
| 57 return false; // add flag to images? | 56 return false; // add flag to images? |
| 58 } else { | 57 } else { |
| 59 return fBitmap.isVolatile(); | 58 return fBitmap.isVolatile(); |
| (...skipping 17 matching lines...) Expand all Loading... |
| 77 } | 76 } |
| 78 | 77 |
| 79 bool SkBitmapProvider::asBitmap(SkBitmap* bm) const { | 78 bool SkBitmapProvider::asBitmap(SkBitmap* bm) const { |
| 80 if (fImage) { | 79 if (fImage) { |
| 81 return as_IB(fImage)->getROPixels(bm, SkImage::kAllow_CachingHint); | 80 return as_IB(fImage)->getROPixels(bm, SkImage::kAllow_CachingHint); |
| 82 } else { | 81 } else { |
| 83 *bm = fBitmap; | 82 *bm = fBitmap; |
| 84 return true; | 83 return true; |
| 85 } | 84 } |
| 86 } | 85 } |
| OLD | NEW |