| Index: src/views/SkWidgets.cpp
|
| diff --git a/src/views/SkWidgets.cpp b/src/views/SkWidgets.cpp
|
| index e4547ec0e60892bef5394157b0ead8fc10857660..fb16f1ec0d82b8c992ffea5b9d360107e61d721a 100644
|
| --- a/src/views/SkWidgets.cpp
|
| +++ b/src/views/SkWidgets.cpp
|
| @@ -507,7 +507,7 @@ bool SkBitmapView::getBitmap(SkBitmap* bitmap) const
|
| {
|
| if (bitmap)
|
| *bitmap = fBitmap;
|
| - return fBitmap.getConfig() != SkBitmap::kNo_Config;
|
| + return fBitmap.colorType() != kUnknown_SkColorType;
|
| }
|
|
|
| void SkBitmapView::setBitmap(const SkBitmap* bitmap, bool viewOwnsPixels)
|
| @@ -534,7 +534,7 @@ bool SkBitmapView::loadBitmapFromFile(const char path[])
|
|
|
| void SkBitmapView::onDraw(SkCanvas* canvas)
|
| {
|
| - if (fBitmap.getConfig() != SkBitmap::kNo_Config &&
|
| + if (fBitmap.colorType() != kUnknown_SkColorType &&
|
| fBitmap.width() && fBitmap.height())
|
| {
|
| SkAutoCanvasRestore restore(canvas, true);
|
|
|