| Index: src/core/SkBitmap.cpp
|
| diff --git a/src/core/SkBitmap.cpp b/src/core/SkBitmap.cpp
|
| index 122996a31229cdb28d9120903a4b080a0684f0e0..b53e4bc3506704f19ae88e79fcb72458f2c516d1 100644
|
| --- a/src/core/SkBitmap.cpp
|
| +++ b/src/core/SkBitmap.cpp
|
| @@ -1625,7 +1625,11 @@ SkBitmap::RLEPixels::~RLEPixels() {
|
| void SkBitmap::validate() const {
|
| SkASSERT(fConfig < kConfigCount);
|
| SkASSERT(fRowBytes >= (unsigned)ComputeRowBytes((Config)fConfig, fWidth));
|
| - SkASSERT(fFlags <= (kImageIsOpaque_Flag | kImageIsVolatile_Flag | kImageIsImmutable_Flag));
|
| + uint8_t allFlags = kImageIsOpaque_Flag | kImageIsVolatile_Flag | kImageIsImmutable_Flag;
|
| +#ifdef SK_BUILD_FOR_ANDROID
|
| + allFlags |= kHasHardwareMipMap_Flag;
|
| +#endif
|
| + SkASSERT(fFlags <= allFlags);
|
| SkASSERT(fPixelLockCount >= 0);
|
| SkASSERT(NULL == fColorTable || (unsigned)fColorTable->getRefCnt() < 10000);
|
| SkASSERT((uint8_t)ComputeBytesPerPixel((Config)fConfig) == fBytesPerPixel);
|
|
|