From 85d9667f59d4138438427bb2cdf67992d100e1a0 Mon Sep 17 00:00:00 2001 From: bsalomon Date: Tue, 10 May 2016 06:19:21 -0700 Subject: Revert of Replace GrStrokeInfo with GrStyle. (patchset #4 id:160001 of https://codereview.chromium.org/1957363002/ ) Reason for revert: Breaking some bots Original issue's description: > Replace GrStrokeInfo with GrStyle. > > A side effect is that arbitrary path effects can no be pushed deeper into the Ganesh flow for paths. They may be applied by path renderers. > GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1957363002 > > Committed: https://skia.googlesource.com/skia/+/33595bdf4b64a745f6340338d307e806e96c587f TBR=egdaniel@google.com,robertphillips@google.com # Skipping CQ checks because original CL landed less than 1 days ago. NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true Review-Url: https://codereview.chromium.org/1967513002 --- src/gpu/GrPathRendering.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/gpu/GrPathRendering.cpp') diff --git a/src/gpu/GrPathRendering.cpp b/src/gpu/GrPathRendering.cpp index d1345c9b06..a3bba4bc7f 100644 --- a/src/gpu/GrPathRendering.cpp +++ b/src/gpu/GrPathRendering.cpp @@ -54,7 +54,7 @@ private: GrPathRange* GrPathRendering::createGlyphs(const SkTypeface* typeface, const SkScalerContextEffects& effects, const SkDescriptor* desc, - const GrStyle& style) { + const GrStrokeInfo& stroke) { if (nullptr == typeface) { typeface = SkTypeface::GetDefaultTypeface(); SkASSERT(nullptr != typeface); @@ -62,7 +62,7 @@ GrPathRange* GrPathRendering::createGlyphs(const SkTypeface* typeface, if (desc) { SkAutoTUnref generator(new GlyphGenerator(*typeface, effects, *desc)); - return this->createPathRange(generator, style); + return this->createPathRange(generator, stroke); } SkScalerContextRec rec; @@ -83,5 +83,5 @@ GrPathRange* GrPathRendering::createGlyphs(const SkTypeface* typeface, SkScalerContextEffects noEffects; SkAutoTUnref generator(new GlyphGenerator(*typeface, noEffects, *genericDesc)); - return this->createPathRange(generator, style); + return this->createPathRange(generator, stroke); } -- cgit v1.2.3