commit 40894189c86ac5cdb8a232946518c0a63fd4b030
author Herb Derby <herb@google.com> Wed Dec 02 11:39:48 2020 -0500
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Wed Dec 02 17:36:06 2020 +0000
tree 7b18c990f2887ea9e0efee7867b6928e6b0fde63
parent 0861331ff70091fada813a72033760b33de0b358

hoist the common matrix code for filling vertices

Change-Id: Ic10a5b8d7c41b17de097385a0264e5379acc9687
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/340136
Reviewed-by: Robert Phillips <robertphillips@google.com>
Commit-Queue: Herb Derby <herb@google.com>

src/gpu/ops/GrAtlasTextOp.cpp

diff --git a/src/gpu/ops/GrAtlasTextOp.cpp b/src/gpu/ops/GrAtlasTextOp.cpp
index 88a328b..467ff3c 100644
--- a/src/gpu/ops/GrAtlasTextOp.cpp
+++ b/src/gpu/ops/GrAtlasTextOp.cpp
@@ -80,8 +80,10 @@
 }
 
 void GrAtlasTextOp::Geometry::fillVertexData(void *dst, int offset, int count) const {
-    fSubRun.fillVertexData(dst, offset, count, fColor.toBytes_RGBA(),
-                           fDrawMatrix, fDrawOrigin, fClipRect);
+    SkMatrix positionMatrix = fDrawMatrix;
+    positionMatrix.preTranslate(fDrawOrigin.x(), fDrawOrigin.y());
+    fSubRun.fillVertexData(
+            dst, offset, count, fColor.toBytes_RGBA(), positionMatrix, fClipRect);
 }
 
 void GrAtlasTextOp::visitProxies(const VisitProxyFunc& func) const {