commit 7888de0db74ac08162c85903a71a48f6d2a3013f
author bsalomon <bsalomon@google.com> Mon Mar 28 15:04:45 2016 -0700
committer Commit bot <commit-bot@chromium.org> Mon Mar 28 15:04:45 2016 -0700
tree c675810b707e4dd02e6d57b351f5a59f514a3dac
parent 5cd0ed38ab77c6009955460361c098f6fc8498e9

Fix GrConvexPolyEffect to deal with line paths.

BUG=skia:4727
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1839743002

Review URL: https://codereview.chromium.org/1839743002

gm/convexpolyeffect.cpp

diff --git a/gm/convexpolyeffect.cpp b/gm/convexpolyeffect.cpp
index 57ee307..412e478 100644
--- a/gm/convexpolyeffect.cpp
+++ b/gm/convexpolyeffect.cpp
@@ -135,6 +135,11 @@
         ngon.transform(scaleM);
         fPaths.addToTail(ngon);
 
+        SkPath linePath;
+        linePath.moveTo(5.f, 5.f);
+        linePath.lineTo(6.f, 6.f);
+        fPaths.addToTail(linePath);
+
         // integer edges
         fRects.addToTail(SkRect::MakeLTRB(5.f, 1.f, 30.f, 25.f));
         // half-integer edges
@@ -175,6 +180,7 @@
                 GrDefaultGeoProcFactory::Create(color, coverage, localCoords, SkMatrix::I()));
 
         SkScalar y = 0;
+        static const SkScalar kDX = 12.f;
         for (PathList::Iter iter(fPaths, PathList::Iter::kHead_IterStart);
              iter.get();
              iter.next()) {
@@ -207,7 +213,7 @@
 
                 drawContext->drawContextPriv().testingOnly_drawBatch(pipelineBuilder, batch);
 
-                x += SkScalarCeilToScalar(path->getBounds().width() + 10.f);
+                x += SkScalarCeilToScalar(path->getBounds().width() + kDX);
             }
 
             // Draw AA and non AA paths using normal API for reference.
@@ -254,7 +260,7 @@
 
                 drawContext->drawContextPriv().testingOnly_drawBatch(pipelineBuilder, batch);
 
-                x += SkScalarCeilToScalar(rect.width() + 10.f);
+                x += SkScalarCeilToScalar(rect.width() + kDX);
             }
 
             // Draw rect without and with AA using normal API for reference
@@ -262,7 +268,7 @@
             canvas->translate(x, y);
             SkPaint paint;
             canvas->drawRect(*iter.get(), paint);
-            x += SkScalarCeilToScalar(iter.get()->width() + 10.f);
+            x += SkScalarCeilToScalar(iter.get()->width() + kDX);
             paint.setAntiAlias(true);
             canvas->drawRect(*iter.get(), paint);
             canvas->restore();