diff options
author | Mike Reed <reed@google.com> | 2017-12-28 16:30:52 -0500 |
---|---|---|
committer | Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-12-29 02:52:00 +0000 |
commit | f3504d430cec35330017aa2af3a51083801c7dd9 (patch) | |
tree | 077a8bc5dc1bc0b648fa98051b27b89703d7bf82 /src/shaders | |
parent | 2a2dfcbb4267e1c7e4aac39e0d78bc41695a2259 (diff) |
remove legacy support for old old picture versions
Bug: skia:
Change-Id: Ieb97eabdb18e8c7bfa86e6a1fc6e0389cd096daa
Reviewed-on: https://skia-review.googlesource.com/89860
Reviewed-by: Florin Malita <fmalita@chromium.org>
Commit-Queue: Mike Reed <reed@google.com>
Diffstat (limited to 'src/shaders')
-rw-r--r-- | src/shaders/SkComposeShader.cpp | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/src/shaders/SkComposeShader.cpp b/src/shaders/SkComposeShader.cpp index 34e54863b7..2feae7788e 100644 --- a/src/shaders/SkComposeShader.cpp +++ b/src/shaders/SkComposeShader.cpp @@ -43,17 +43,12 @@ sk_sp<SkFlattenable> SkComposeShader::CreateProc(SkReadBuffer& buffer) { sk_sp<SkShader> dst(buffer.readShader()); sk_sp<SkShader> src(buffer.readShader()); unsigned mode = buffer.read32(); - - float lerp = 1; - if (!buffer.isVersionLT(SkReadBuffer::kComposeShaderCanLerp_Version)) { - lerp = buffer.readScalar(); - } + float lerp = buffer.readScalar(); // check for valid mode before we cast to the enum type - if (mode > (unsigned)SkBlendMode::kLastMode) { + if (!buffer.validate(mode <= (unsigned)SkBlendMode::kLastMode)) { return nullptr; } - return MakeCompose(std::move(dst), std::move(src), static_cast<SkBlendMode>(mode), lerp); } |