commit 70bc94f273224ed0755ae11dc479c57ff37e0436
author Mike Reed <reed@google.com> Thu Jun 08 12:45:52 2017 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Thu Jun 08 18:23:19 2017 +0000
tree f25bc45fd7e882d3baee4b3640b82b881d45ae23
parent bc2cdd154bf5a031ca9d3a530123d9f7a4c0925d

Bump min picture to 7+ months ago

Delete lots of support code, including need for SkXfermode objects
which are no longer used anywhere else.

Bug: skia:
Change-Id: Id6b7ef0f529691041ff2b206c35e336e8a4c974d
Reviewed-on: https://skia-review.googlesource.com/19059
Commit-Queue: Mike Reed <reed@google.com>
Reviewed-by: Robert Phillips <robertphillips@google.com>

src/shaders/SkComposeShader.cpp

diff --git a/src/shaders/SkComposeShader.cpp b/src/shaders/SkComposeShader.cpp
index 135f91d..75f9cd2 100644
--- a/src/shaders/SkComposeShader.cpp
+++ b/src/shaders/SkComposeShader.cpp
@@ -36,13 +36,8 @@
 sk_sp<SkFlattenable> SkComposeShader::CreateProc(SkReadBuffer& buffer) {
     sk_sp<SkShader> shaderA(buffer.readShader());
     sk_sp<SkShader> shaderB(buffer.readShader());
-    SkBlendMode mode;
-    if (buffer.isVersionLT(SkReadBuffer::kXfermodeToBlendMode2_Version)) {
-        sk_sp<SkXfermode> xfer = buffer.readXfermode();
-        mode = xfer ? xfer->blend() : SkBlendMode::kSrcOver;
-    } else {
-        mode = (SkBlendMode)buffer.read32();
-    }
+    SkBlendMode mode = (SkBlendMode)buffer.read32();
+
     if (!shaderA || !shaderB) {
         return nullptr;
     }