Remove DrawFace enum from GrPipelineBuilder

src/gpu/vk/GrVkPipeline.cpp

Index: src/gpu/vk/GrVkPipeline.cpp
diff --git a/src/gpu/vk/GrVkPipeline.cpp b/src/gpu/vk/GrVkPipeline.cpp
index 0ba111af0990c522ddafc20e10a3c326125f7cea..055bb94d6f961e160b3f96246707e0ee5da20507 100644
--- a/src/gpu/vk/GrVkPipeline.cpp
+++ b/src/gpu/vk/GrVkPipeline.cpp
@@ -356,19 +356,19 @@ void setup_color_blend_state(const GrVkGpu* gpu,
     // colorBlendInfo->blendConstants is set dynamically
 }
 
-VkCullModeFlags draw_face_to_vk_cull_mode(GrPipelineBuilder::DrawFace drawFace) {
+VkCullModeFlags draw_face_to_vk_cull_mode(GrDrawFace drawFace) {
     // Assumes that we've set the front face to be ccw
     static const VkCullModeFlags gTable[] = {
         VK_CULL_MODE_NONE,              // kBoth_DrawFace
         VK_CULL_MODE_BACK_BIT,          // kCCW_DrawFace, cull back face
         VK_CULL_MODE_FRONT_BIT,         // kCW_DrawFace, cull front face
     };
-    GR_STATIC_ASSERT(0 == GrPipelineBuilder::kBoth_DrawFace);
-    GR_STATIC_ASSERT(1 == GrPipelineBuilder::kCCW_DrawFace);
-    GR_STATIC_ASSERT(2 == GrPipelineBuilder::kCW_DrawFace);
-    SkASSERT((unsigned)drawFace <= 2);
+    GR_STATIC_ASSERT(0 == (int)GrDrawFace::kBoth);
+    GR_STATIC_ASSERT(1 == (int)GrDrawFace::kCCW);
+    GR_STATIC_ASSERT(2 == (int)GrDrawFace::kCW);
+    SkASSERT(-1 < (int)drawFace && (int)drawFace <= 2);
 
-    return gTable[drawFace];
+    return gTable[(int)drawFace];
 }
 
 void setup_raster_state(const GrVkGpu* gpu,