commit 86fedbb9dd05f911ef623e6af19c99af73e4ceb7
author Brian Osman <brianosman@google.com> Mon May 18 10:11:49 2020 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Tue May 19 14:24:10 2020 +0000
tree 7307d772d505bf346299a087ea8cc06c8c37b5ff
parent b65024b5f237a64c8aca374a84f339cec0965973

Remove legacy matrix concat code

Chrome has been rebaselined to use the 4x4 concat

Change-Id: I36830a61ac2f2f44e0125798e8a7f12d79d9cbcb
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/290442
Reviewed-by: Mike Reed <reed@google.com>
Commit-Queue: Brian Osman <brianosman@google.com>

src/core/SkMatrixProvider.h

diff --git a/src/core/SkMatrixProvider.h b/src/core/SkMatrixProvider.h
index 05d4e9d..2033ec2 100644
--- a/src/core/SkMatrixProvider.h
+++ b/src/core/SkMatrixProvider.h
@@ -54,14 +54,10 @@
 class SkPostTranslateMatrixProvider : public SkMatrixProvider {
 public:
     SkPostTranslateMatrixProvider(const SkMatrixProvider& parent, SkScalar dx, SkScalar dy)
-#if defined(SK_SUPPORT_LEGACY_MATRIX44)
-            : SkMatrixProvider(SkMatrix::Concat(SkMatrix::MakeTrans(dx, dy), parent.localToDevice()))
-#else
             : SkMatrixProvider(SkM44::Translate(dx, dy) * parent.localToDevice44())
-#endif
             , fParent(parent) {}
 
-    // Assume that the post-matrix doesn't apply to any marked matrices
+    // Assume that the post-translation doesn't apply to any marked matrices
     bool getLocalToMarker(uint32_t id, SkM44* localToMarker) const override {
         return fParent.getLocalToMarker(id, localToMarker);
     }
@@ -73,11 +69,7 @@
 class SkPreConcatMatrixProvider : public SkMatrixProvider {
 public:
     SkPreConcatMatrixProvider(const SkMatrixProvider& parent, const SkMatrix& preMatrix)
-#if defined(SK_SUPPORT_LEGACY_MATRIX44)
-            : SkMatrixProvider(SkMatrix::Concat(parent.localToDevice(), preMatrix))
-#else
             : SkMatrixProvider(parent.localToDevice44() * SkM44(preMatrix))
-#endif
             , fParent(parent)
             , fPreMatrix(preMatrix) {}