Add cap type variations to circular arcs GMs

gm/circulararcs.cpp

 /*
  * Copyright 2016 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include <functional>
 #include "SkCanvas.h"
 #include "gm.h"
@@ skipping 84 matching lines @@
 }
 
 DEF_ARC_GM(stroke_round) {
     auto setStroke = [] (SkPaint* p) {
         p->setStyle(SkPaint::kStroke_Style);
         p->setStrokeCap(SkPaint::kRound_Cap);
     };
     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);
     };
     draw_arcs(canvas, setStroke);
 }