commit 01b2b83aba10bc3767d660cd619c1da58b5eb0b5
author Mike Reed <reed@google.com> Fri Jun 09 10:51:52 2017 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Fri Jun 09 17:13:53 2017 +0000
tree e9336afbe6552b1d603ed11645af813ea91c01bb
parent 6a0feba05bd57e84103cebc695d4a217ec9e472e

Extend composeshader to support a lerp parameter

Bug: skia:
Change-Id: I3bbb2cb8d0a84fca0309654498548ebc94d8938f
Reviewed-on: https://skia-review.googlesource.com/18460
Commit-Queue: Mike Reed <reed@google.com>
Reviewed-by: Florin Malita <fmalita@chromium.org>

src/core/SkDraw_vertices.cpp

diff --git a/src/core/SkDraw_vertices.cpp b/src/core/SkDraw_vertices.cpp
index d0ef2d7..4f7fc13 100644
--- a/src/core/SkDraw_vertices.cpp
+++ b/src/core/SkDraw_vertices.cpp
@@ -247,7 +247,7 @@
             matrix43 = triShader->getMatrix43();
             if (shader) {
                 shader = outerAlloc.make<SkComposeShader>(sk_ref_sp(triShader), sk_ref_sp(shader),
-                                                          bmode);
+                                                          bmode, 1);
             } else {
                 shader = triShader;
             }

src/core/SkReadBuffer.h

diff --git a/src/core/SkReadBuffer.h b/src/core/SkReadBuffer.h
index 4e61050..48cb225 100644
--- a/src/core/SkReadBuffer.h
+++ b/src/core/SkReadBuffer.h
@@ -72,6 +72,7 @@
         kXfermodeToBlendMode2_Version      = 51,
          */
         kTextBlobImplicitRunCount_Version  = 52,
+        kComposeShaderCanLerp_Version      = 54,
     };
 
     /**