diff options
author | bsalomon <bsalomon@google.com> | 2016-05-05 08:28:30 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2016-05-05 08:28:30 -0700 |
commit | f0cf355b55eec7dacaa6c8e87c736e359b3ee278 (patch) | |
tree | 7eb1780e8cee46bec33ed503aa2662c18bcbf6c2 /src/gpu | |
parent | 959a2937d55279c6d020f2511007bb39ed322ace (diff) |
Stop banning stroke-and-fill for GrStyle and add tests
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1949943003
Review-Url: https://codereview.chromium.org/1949943003
Diffstat (limited to 'src/gpu')
-rw-r--r-- | src/gpu/GrStyle.h | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/src/gpu/GrStyle.h b/src/gpu/GrStyle.h index c65b22b81a..bc87ebd61f 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()); } |