Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(48)

Unified Diff: src/core/SkReadBuffer.cpp

Issue 770703002: Bump min picture version. (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: TODO Created 6 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « src/core/SkReadBuffer.h ('k') | src/core/SkShader.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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.
« no previous file with comments | « src/core/SkReadBuffer.h ('k') | src/core/SkShader.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698