From 635df95a9a25c66959f76b4bbb594b75333ded21 Mon Sep 17 00:00:00 2001 From: bsalomon Date: Tue, 28 Jun 2016 11:18:47 -0700 Subject: Revert of Make lines a special case in GrShape (patchset #5 id:120001 of https://codereview.chromium.org/2108523002/ ) Reason for revert: Assertion failures Original issue's description: > Make lines a special case in GrShape > > BUG=skia: > GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2108523002 > > Committed: https://skia.googlesource.com/skia/+/c62318c748a1907649bd75382c4f4fd10533f2b3 TBR=robertphillips@google.com,egdaniel@google.com # Skipping CQ checks because original CL landed less than 1 days ago. NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=skia: Review-Url: https://codereview.chromium.org/2109613003 --- src/gpu/batches/GrDashLinePathRenderer.cpp | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'src/gpu/batches/GrDashLinePathRenderer.cpp') diff --git a/src/gpu/batches/GrDashLinePathRenderer.cpp b/src/gpu/batches/GrDashLinePathRenderer.cpp index e7ef2402a9..8dba7b94da 100644 --- a/src/gpu/batches/GrDashLinePathRenderer.cpp +++ b/src/gpu/batches/GrDashLinePathRenderer.cpp @@ -13,10 +13,7 @@ bool GrDashLinePathRenderer::onCanDrawPath(const CanDrawPathArgs& args) const { SkPoint pts[2]; - bool inverted; - if (args.fShape->style().isDashed() && args.fShape->asLine(pts, &inverted)) { - // We should never have an inverse dashed case. - SkASSERT(!inverted); + if (args.fShape->style().isDashed() && args.fShape->asLine(pts)) { return GrDashingEffect::CanDrawDashLine(pts, args.fShape->style(), *args.fViewMatrix); } return false; @@ -37,7 +34,7 @@ bool GrDashLinePathRenderer::onDrawPath(const DrawPathArgs& args) { aaMode = GrDashingEffect::AAMode::kNone; } SkPoint pts[2]; - SkAssertResult(args.fShape->asLine(pts, nullptr)); + SkAssertResult(args.fShape->asLine(pts)); SkAutoTUnref batch(GrDashingEffect::CreateDashLineBatch(args.fColor, *args.fViewMatrix, pts, -- cgit v1.2.3