commit eb694b767c11c60b91bd90e42b9c82498baec1c1
author Chris Dalton <csmartdalton@google.com> Mon Mar 16 09:25:50 2020 -0600
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Mon Mar 16 16:18:30 2020 +0000
tree aeda1692901b8863dd663ddd7e8b9e00457c87c1
parent 6c138716e9adc18617df9b4d381a04dd9d5dd599

Rename GrMesh to GrSimpleMesh

Change-Id: Ib164ff3ec41cb798385f2feea8ad09c037dbc30d
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/276837
Reviewed-by: Greg Daniel <egdaniel@google.com>
Commit-Queue: Chris Dalton <csmartdalton@google.com>

src/gpu/ops/GrDefaultPathRenderer.cpp

diff --git a/src/gpu/ops/GrDefaultPathRenderer.cpp b/src/gpu/ops/GrDefaultPathRenderer.cpp
index 0b676c2..60606eb 100644
--- a/src/gpu/ops/GrDefaultPathRenderer.cpp
+++ b/src/gpu/ops/GrDefaultPathRenderer.cpp
@@ -17,10 +17,10 @@
 #include "src/gpu/GrDefaultGeoProcFactory.h"
 #include "src/gpu/GrDrawOpTest.h"
 #include "src/gpu/GrFixedClip.h"
-#include "src/gpu/GrMesh.h"
 #include "src/gpu/GrOpFlushState.h"
 #include "src/gpu/GrProgramInfo.h"
 #include "src/gpu/GrRenderTargetContextPriv.h"
+#include "src/gpu/GrSimpleMesh.h"
 #include "src/gpu/GrStyle.h"
 #include "src/gpu/GrSurfaceContextPriv.h"
 #include "src/gpu/geometry/GrPathUtils.h"
@@ -69,7 +69,7 @@
 public:
     PathGeoBuilder(GrPrimitiveType primitiveType,
                    GrMeshDrawOp::Target* target,
-                   SkTDArray<GrMesh*>* meshes)
+                   SkTDArray<GrSimpleMesh*>* meshes)
             : fPrimitiveType(primitiveType)
             , fTarget(target)
             , fVertexStride(sizeof(SkPoint))
@@ -270,7 +270,7 @@
         SkASSERT(vertexCount <= fVerticesInChunk);
         SkASSERT(indexCount <= fIndicesInChunk);
 
-        GrMesh* mesh = nullptr;
+        GrSimpleMesh* mesh = nullptr;
         if (this->isIndexed() ? SkToBool(indexCount) : SkToBool(vertexCount)) {
             mesh = fTarget->allocMesh();
             if (!this->isIndexed()) {
@@ -333,7 +333,7 @@
     uint16_t* fCurIdx;
     uint16_t fSubpathIndexStart;
 
-    SkTDArray<GrMesh*>* fMeshes;
+    SkTDArray<GrSimpleMesh*>* fMeshes;
 };
 
 class DefaultPathOp final : public GrMeshDrawOp {
@@ -524,8 +524,8 @@
     SkMatrix fViewMatrix;
     bool fIsHairline;
 
-    SkTDArray<GrMesh*> fMeshes;
-    GrProgramInfo*     fProgramInfo = nullptr;
+    SkTDArray<GrSimpleMesh*> fMeshes;
+    GrProgramInfo* fProgramInfo = nullptr;
 
     typedef GrMeshDrawOp INHERITED;
 };