commit 90432c09ce002cc6db420d8717b193e43770f34a
author Jim Van Verth <jvanverth@google.com> Fri Mar 09 15:35:00 2018 -0500
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Fri Mar 09 21:14:41 2018 +0000
tree c36928a1888d3fd38aeea6bff73cf8ce527d64ae
parent 4e83ff1aa746e4bfd0c6470713084cc6783c367f

Add a negative translation to one of the smallpath GMs

Just ensuring we have coverage for this case.

Change-Id: Ifcded974068e9ef90d0eb0f07eb90e0bd563d7c7
Reviewed-on: https://skia-review.googlesource.com/113461
Reviewed-by: Brian Salomon <bsalomon@google.com>
Commit-Queue: Jim Van Verth <jvanverth@google.com>

gm/smallpaths.cpp

diff --git a/gm/smallpaths.cpp b/gm/smallpaths.cpp
index b6a3b33..779e0d6 100644
--- a/gm/smallpaths.cpp
+++ b/gm/smallpaths.cpp
@@ -106,7 +106,7 @@
 }
 
 static SkScalar make_battery(SkPath* path) {
-    static SkScalar xOffset = 5.f;
+    static SkScalar xOffset = 5.0f;
 
     path->moveTo(24.67f + xOffset, 0.33000004f);
     path->lineTo(8.3299999f + xOffset, 0.33000004f);
@@ -132,7 +132,7 @@
 }
 
 static SkScalar make_battery2(SkPath* path) {
-    static SkScalar xOffset = 5.f;
+    static SkScalar xOffset = 225.625f;
 
     path->moveTo(32.669998f + xOffset, 9.8640003f);
     path->lineTo(0.33000004f + xOffset, 9.8640003f);
@@ -193,6 +193,19 @@
     4.0f,
 };
 
+constexpr SkScalar gXTranslate[] = {
+    0.0f,
+    0.0f,
+    0.0f,
+    0.0f,
+    0.0f,
+    0.0f,
+    0.0f,
+    0.0f,
+    -220.625f,
+    0.0f,
+};
+
 #define N   SK_ARRAY_COUNT(gProcs)
 
 // This GM tests out drawing small paths (i.e., for Ganesh, using the Distance
@@ -225,7 +238,7 @@
         canvas->save();
         for (size_t i = 0; i < N; i++) {
             canvas->drawPath(fPath[i], paint);
-            canvas->translate(SkIntToScalar(0), fDY[i]);
+            canvas->translate(gXTranslate[i], fDY[i]);
         }
         canvas->restore();
         canvas->translate(SkIntToScalar(120), SkIntToScalar(0));
@@ -238,7 +251,7 @@
             paint.setStrokeWidth(gWidths[i]);
             paint.setStrokeMiter(gMiters[i]);
             canvas->drawPath(fPath[i], paint);
-            canvas->translate(SkIntToScalar(0), fDY[i]);
+            canvas->translate(gXTranslate[i], fDY[i]);
         }
         canvas->restore();
         canvas->translate(SkIntToScalar(120), SkIntToScalar(0));
@@ -251,7 +264,7 @@
             paint.setStrokeWidth(gWidths[i] + 2.0f);
             paint.setStrokeMiter(gMiters[i]);
             canvas->drawPath(fPath[i], paint);
-            canvas->translate(SkIntToScalar(0), fDY[i]);
+            canvas->translate(gXTranslate[i], fDY[i]);
         }
         canvas->restore();
         canvas->translate(SkIntToScalar(120), SkIntToScalar(0));
@@ -263,7 +276,7 @@
             paint.setStrokeWidth(gWidths[i]);
             paint.setStrokeMiter(gMiters[i]);
             canvas->drawPath(fPath[i], paint);
-            canvas->translate(SkIntToScalar(0), fDY[i]);
+            canvas->translate(gXTranslate[i], fDY[i]);
         }
 
     }