| Index: src/core/SkScalerContext.cpp
|
| diff --git a/src/core/SkScalerContext.cpp b/src/core/SkScalerContext.cpp
|
| index c67ca3e9fa992a4b6da0a921315e19ff070491bc..a479c3782ffc3a36b5701395d24321867536c28f 100644
|
| --- a/src/core/SkScalerContext.cpp
|
| +++ b/src/core/SkScalerContext.cpp
|
| @@ -100,9 +100,9 @@ SkScalerContext::SkScalerContext(SkTypeface* typeface, const SkDescriptor* desc)
|
| SkDebugf(" textsize %g prescale %g preskew %g post [%g %g %g %g]\n",
|
| rec->fTextSize, rec->fPreScaleX, rec->fPreSkewX, rec->fPost2x2[0][0],
|
| rec->fPost2x2[0][1], rec->fPost2x2[1][0], rec->fPost2x2[1][1]);
|
| - SkDebugf(" frame %g miter %g hints %d framefill %d format %d join %d\n",
|
| + SkDebugf(" frame %g miter %g hints %d framefill %d format %d join %d cap %d\n",
|
| rec->fFrameWidth, rec->fMiterLimit, rec->fHints, rec->fFrameAndFill,
|
| - rec->fMaskFormat, rec->fStrokeJoin);
|
| + rec->fMaskFormat, rec->fStrokeJoin, rec->fStrokeCap);
|
| SkDebugf(" pathEffect %x maskFilter %x\n",
|
| desc->findEntry(kPathEffect_SkDescriptorTag, nullptr),
|
| desc->findEntry(kMaskFilter_SkDescriptorTag, nullptr));
|
| @@ -635,7 +635,7 @@ void SkScalerContext::internalGetPath(const SkGlyph& glyph, SkPath* fillPath,
|
| SkToBool(fRec.fFlags & kFrameAndFill_Flag));
|
| // glyphs are always closed contours, so cap type is ignored,
|
| // so we just pass something.
|
| - rec.setStrokeParams(SkPaint::kButt_Cap,
|
| + rec.setStrokeParams((SkPaint::Cap)fRec.fStrokeCap,
|
| (SkPaint::Join)fRec.fStrokeJoin,
|
| fRec.fMiterLimit);
|
| }
|
|
|