| Index: src/gpu/GrStyle.h
|
| diff --git a/src/gpu/GrStyle.h b/src/gpu/GrStyle.h
|
| index 6acfaa242db6c92675976b9a451e12968dbac726..467e9e0c2a2d6d79e181cdc5e641c2e6e037a11a 100644
|
| --- a/src/gpu/GrStyle.h
|
| +++ b/src/gpu/GrStyle.h
|
| @@ -18,9 +18,6 @@
|
| * as well as an optional path effect. If the path effect represents dashing, the dashing
|
| * information is extracted from the path effect and stored explicitly.
|
| *
|
| - * This object does not support stroke-and-fill styling. It is expected that stroking and filling
|
| - * is handled by drawing a stroke and a fill separately.
|
| - *
|
| * This will replace GrStrokeInfo as GrShape is deployed.
|
| */
|
| class GrStyle {
|
| @@ -79,14 +76,12 @@ public:
|
| explicit GrStyle(SkStrokeRec::InitStyle initStyle) : fStrokeRec(initStyle) {}
|
|
|
| GrStyle(const SkStrokeRec& strokeRec, SkPathEffect* pe) : fStrokeRec(strokeRec) {
|
| - SkASSERT(SkStrokeRec::kStrokeAndFill_Style != strokeRec.getStyle());
|
| this->initPathEffect(pe);
|
| }
|
|
|
| GrStyle(const GrStyle& that) : fStrokeRec(SkStrokeRec::kFill_InitStyle) { *this = that; }
|
|
|
| explicit GrStyle(const SkPaint& paint) : fStrokeRec(paint) {
|
| - SkASSERT(SkStrokeRec::kStrokeAndFill_Style != fStrokeRec.getStyle());
|
| this->initPathEffect(paint.getPathEffect());
|
| }
|
|
|
|
|