Add cap type variations to circular arcs GMs

gm/circulararcs.cpp

Index: gm/circulararcs.cpp
diff --git a/gm/circulararcs.cpp b/gm/circulararcs.cpp
index 2cb525cc2177f9255adbba3dec83584dbd39597d..290390a47ff930547f8d88fcdc8f2350ac9b0bf4 100644
--- a/gm/circulararcs.cpp
+++ b/gm/circulararcs.cpp
@@ -102,7 +102,23 @@ DEF_ARC_GM(stroke_round) {
     draw_arcs(canvas, setStroke);
 }
 
-DEF_ARC_GM(fill_and_Stroke) {
+DEF_ARC_GM(stroke_and_fill_butt) {
+    auto setStroke = [] (SkPaint* p) {
+        p->setStyle(SkPaint::kStrokeAndFill_Style);
+        p->setStrokeCap(SkPaint::kButt_Cap);
+    };
+    draw_arcs(canvas, setStroke);
+}
+
+DEF_ARC_GM(stroke_and_fill_square) {
+    auto setStroke = [] (SkPaint* p) {
+        p->setStyle(SkPaint::kStrokeAndFill_Style);
+        p->setStrokeCap(SkPaint::kSquare_Cap);
+    };
+    draw_arcs(canvas, setStroke);
+}
+
+DEF_ARC_GM(stroke_and_fill_round) {
     auto setStroke = [] (SkPaint* p) {
         p->setStyle(SkPaint::kStrokeAndFill_Style);
         p->setStrokeCap(SkPaint::kRound_Cap);