Revert "Add GrPrimitiveType::kLinesAdjacency"

This reverts commit f7eb015083aba8942031145736251dd32094115d.

Reason for revert: Looks like this is causing build failures:
* https://chromium-swarm.appspot.com/task?id=36baaf4d376bbf10&refresh=10
* https://chromium-swarm.appspot.com/task?id=36baad1f17e93510&refresh=10


Original change's description:
> Add GrPrimitiveType::kLinesAdjacency
> 
> Converts GrPrimitiveType to an enum class and adds kLinesAdjacency.
> 
> Bug: skia:
> Change-Id: If57d26277182aac1375e8181211ddaf7ea6d1e0a
> Reviewed-on: https://skia-review.googlesource.com/19581
> Reviewed-by: Brian Salomon <bsalomon@google.com>
> Commit-Queue: Chris Dalton <csmartdalton@google.com>

TBR=bsalomon@google.com,csmartdalton@google.com

Change-Id: I37a1c575123b357abd8b9af9eea8871fe199f44b
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: skia:
Reviewed-on: https://skia-review.googlesource.com/19661
Reviewed-by: Ravi Mistry <rmistry@google.com>
Commit-Queue: Ravi Mistry <rmistry@google.com>

3 files changed, 6 insertions, 7 deletions

diff --git a/tests/GrMeshTest.cpp b/tests/GrMeshTest.cpp
index 0811982a54..dd2a2d9e33 100644
--- a/tests/GrMeshTest.cpp
+++ b/tests/GrMeshTest.cpp
@@ -147,7 +147,7 @@ DEF_GPUTEST_FOR_RENDERING_CONTEXTS(GrMeshTest, reporter, ctxInfo) {
         auto vbuff = helper->makeVertexBuffer(expandedVertexData);
         VALIDATE(vbuff);
         for (int y = 0; y < kBoxCountY; ++y) {
-            GrMesh mesh(GrPrimitiveType::kTriangles);
+            GrMesh mesh(kTriangles_GrPrimitiveType);
             mesh.setNonIndexedNonInstanced(kBoxCountX * 6);
             mesh.setVertexData(vbuff.get(), y * kBoxCountX * 6);
             helper->drawMesh(mesh);
@@ -167,7 +167,7 @@ DEF_GPUTEST_FOR_RENDERING_CONTEXTS(GrMeshTest, reporter, ctxInfo) {
             GR_STATIC_ASSERT(kIndexPatternRepeatCount >= 3);
             int repetitionCount = SkTMin(3 - baseRepetition, kBoxCount - i);
 
-            GrMesh mesh(GrPrimitiveType::kTriangles);
+            GrMesh mesh(kTriangles_GrPrimitiveType);
             mesh.setIndexed(ibuff.get(), repetitionCount * 6, baseRepetition * 6,
                             baseRepetition * 4, (baseRepetition + repetitionCount) * 4 - 1);
             mesh.setVertexData(vbuff.get(), (i - baseRepetition) * 4);
@@ -187,7 +187,7 @@ DEF_GPUTEST_FOR_RENDERING_CONTEXTS(GrMeshTest, reporter, ctxInfo) {
         // Draw boxes one line at a time to exercise base vertex. setIndexedPatterned does not
         // support a base index.
         for (int y = 0; y < kBoxCountY; ++y) {
-            GrMesh mesh(GrPrimitiveType::kTriangles);
+            GrMesh mesh(kTriangles_GrPrimitiveType);
             mesh.setIndexedPatterned(ibuff.get(), 6, 4, kBoxCountX, kIndexPatternRepeatCount);
             mesh.setVertexData(vbuff.get(), y * kBoxCountX * 4);
             helper->drawMesh(mesh);
@@ -213,8 +213,7 @@ DEF_GPUTEST_FOR_RENDERING_CONTEXTS(GrMeshTest, reporter, ctxInfo) {
             // Draw boxes one line at a time to exercise base instance, base vertex, and null vertex
             // buffer. setIndexedInstanced intentionally does not support a base index.
             for (int y = 0; y < kBoxCountY; ++y) {
-                GrMesh mesh(indexed ? GrPrimitiveType::kTriangles
-                                    : GrPrimitiveType::kTriangleStrip);
+                GrMesh mesh(indexed ? kTriangles_GrPrimitiveType : kTriangleStrip_GrPrimitiveType);
                 if (indexed) {
                     VALIDATE(idxbuff);
                     mesh.setIndexedInstanced(idxbuff.get(), 6,
diff --git a/tests/GrPipelineDynamicStateTest.cpp b/tests/GrPipelineDynamicStateTest.cpp
index f3dd27316d..4c5843aeb1 100644
--- a/tests/GrPipelineDynamicStateTest.cpp
+++ b/tests/GrPipelineDynamicStateTest.cpp
@@ -126,7 +126,7 @@ private:
         GrPipeline pipeline(rt, fScissorState, SkBlendMode::kSrc);
         SkSTArray<kNumMeshes, GrMesh> meshes;
         for (int i = 0; i < kNumMeshes; ++i) {
-            GrMesh& mesh = meshes.emplace_back(GrPrimitiveType::kTriangleStrip);
+            GrMesh& mesh = meshes.emplace_back(kTriangleStrip_GrPrimitiveType);
             mesh.setNonIndexedNonInstanced(4);
             mesh.setVertexData(fVertexBuffer.get(), 4 * i);
         }
diff --git a/tests/OnFlushCallbackTest.cpp b/tests/OnFlushCallbackTest.cpp
index f8198687cb..f8026e816a 100644
--- a/tests/OnFlushCallbackTest.cpp
+++ b/tests/OnFlushCallbackTest.cpp
@@ -144,7 +144,7 @@ private:
             }
         }
 
-        GrMesh mesh(GrPrimitiveType::kTriangles);
+        GrMesh mesh(kTriangles_GrPrimitiveType);
         mesh.setIndexed(indexBuffer, 6, firstIndex, 0, 3);
         mesh.setVertexData(vertexBuffer, firstVertex);