aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/effects/SkBitmapSource.cpp
diff options
context:
space:
mode:
authorGravatar mtklein <mtklein@chromium.org>2014-12-01 06:56:38 -0800
committerGravatar Commit bot <commit-bot@chromium.org>2014-12-01 06:56:38 -0800
commit88fd0fbcccea615f2d2cd61a121ac9e3185adfe4 (patch)
treef0b13b3d4de8d110ce75f9f03e6cc18fb9aef744 /src/effects/SkBitmapSource.cpp
parentbb25e44593ff9c318d9fe1dbb5cf30bc2b89eb76 (diff)
Bump min picture version.
Chrome Stable is M39, which produces picture format v35: https://chromium.googlesource.com/skia/+/chrome/m39/include/core/SkPicture.h We don't need any code to deal with pictures older than v35. (When M40 goes stable, we can step up to v37, the current latest version.) BUG=skia: Review URL: https://codereview.chromium.org/770703002
Diffstat (limited to 'src/effects/SkBitmapSource.cpp')
-rw-r--r--src/effects/SkBitmapSource.cpp6
1 files changed, 1 insertions, 5 deletions
diff --git a/src/effects/SkBitmapSource.cpp b/src/effects/SkBitmapSource.cpp
index 1d8078d59f..4da77a9e02 100644
--- a/src/effects/SkBitmapSource.cpp
+++ b/src/effects/SkBitmapSource.cpp
@@ -28,11 +28,7 @@ SkBitmapSource::SkBitmapSource(const SkBitmap& bitmap, const SkRect& srcRect, co
#ifdef SK_SUPPORT_LEGACY_DEEPFLATTENING
SkBitmapSource::SkBitmapSource(SkReadBuffer& buffer) : INHERITED(0, buffer) {
- if (buffer.isVersionLT(SkReadBuffer::kNoMoreBitmapFlatten_Version)) {
- fBitmap.legacyUnflatten(buffer);
- } else {
- buffer.readBitmap(&fBitmap);
- }
+ buffer.readBitmap(&fBitmap);
buffer.readRect(&fSrcRect);
buffer.readRect(&fDstRect);
buffer.validate(buffer.isValid() && SkIsValidRect(fSrcRect) && SkIsValidRect(fDstRect));