commit 1f60733fb3e7019bc51a251ebc116e9adebd71c3
author Mike Reed <reed@google.com> Thu May 21 12:11:27 2020 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Thu May 21 16:58:39 2020 +0000
tree 6ecb87d4567eddd991d29b0d770516898693a39f
parent 83ed957d70b628bc8004b6dee4881ccf8d137cc1

Revert "Revert "move onto new factories for SkMatrix""

This reverts commit c80ee456adf664c4a62fa2ccaeaf157c723ed656.

fix: update flutter's gn file to add guard

Change-Id: Iac5171c8475d9a862d06255dab1c6f38f10de2f2
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/291361
Reviewed-by: Mike Reed <reed@google.com>
Commit-Queue: Mike Reed <reed@google.com>

src/shaders/gradients/SkTwoPointConicalGradient.cpp

diff --git a/src/shaders/gradients/SkTwoPointConicalGradient.cpp b/src/shaders/gradients/SkTwoPointConicalGradient.cpp
index 811d719..42b3d6f 100644
--- a/src/shaders/gradients/SkTwoPointConicalGradient.cpp
+++ b/src/shaders/gradients/SkTwoPointConicalGradient.cpp
@@ -62,7 +62,7 @@
         }
         // Concentric case: we can pretend we're radial (with a tiny twist).
         const SkScalar scale = sk_ieee_float_divide(1, std::max(r0, r1));
-        gradientMatrix = SkMatrix::MakeTrans(-c1.x(), -c1.y());
+        gradientMatrix = SkMatrix::Translate(-c1.x(), -c1.y());
         gradientMatrix.postScale(scale, scale);
 
         gradientType = Type::kRadial;
@@ -188,8 +188,7 @@
         auto scale =  std::max(fRadius1, fRadius2) / dRadius;
         auto bias  = -fRadius1 / dRadius;
 
-        p->append_matrix(alloc, SkMatrix::Concat(SkMatrix::MakeTrans(bias, 0),
-                                                 SkMatrix::MakeScale(scale, 1)));
+        p->append_matrix(alloc, SkMatrix::Translate(bias, 0) * SkMatrix::Scale(scale, 1));
         return;
     }