| Index: src/core/SkReadBuffer.cpp
|
| diff --git a/src/core/SkReadBuffer.cpp b/src/core/SkReadBuffer.cpp
|
| index 390b6b1372eae26e1bd4d665e1106ec31965a89f..58a4ac42dbb40101a3e6fdf68ef0d59b48412a26 100644
|
| --- a/src/core/SkReadBuffer.cpp
|
| +++ b/src/core/SkReadBuffer.cpp
|
| @@ -265,17 +265,8 @@ bool SkReadBuffer::readBitmap(SkBitmap* bitmap) {
|
| // larger deserialize.
|
| bitmap->setInfo(SkImageInfo::MakeUnknown(width, height));
|
| return true;
|
| - } else {
|
| - // A size of zero means the SkBitmap was simply flattened.
|
| - if (this->isVersionLT(kNoMoreBitmapFlatten_Version)) {
|
| - SkBitmap tmp;
|
| - tmp.legacyUnflatten(*this);
|
| - // just throw this guy away
|
| - } else {
|
| - if (SkBitmap::ReadRawPixels(this, bitmap)) {
|
| - return true;
|
| - }
|
| - }
|
| + } else if (SkBitmap::ReadRawPixels(this, bitmap)) {
|
| + return true;
|
| }
|
| }
|
| // Could not read the SkBitmap. Use a placeholder bitmap.
|
|
|