57a0edf7ba
Currently we use 'fill-rule' when emitting clip paths. This is wrong: per spec [1], clip paths observe 'clip-rule', not 'fill-rule'. [1] https://www.w3.org/TR/SVG/masking.html#ClipRuleProperty Change-Id: Idf81de05e9601663c8dbc9856900ffa679daf4a5 Reviewed-on: https://skia-review.googlesource.com/57661 Reviewed-by: Robert Phillips <robertphillips@google.com> Reviewed-by: Stephan Altmueller <stephana@google.com> Commit-Queue: Florin Malita <fmalita@chromium.org>
51 lines
1.5 KiB
C++
51 lines
1.5 KiB
C++
/*
|
|
* Copyright 2016 Google Inc.
|
|
*
|
|
* Use of this source code is governed by a BSD-style license that can be
|
|
* found in the LICENSE file.
|
|
*/
|
|
|
|
#include "SkCanvas.h"
|
|
#include "SkTLazy.h"
|
|
#include "SkSVGRenderContext.h"
|
|
#include "SkSVGPoly.h"
|
|
#include "SkSVGValue.h"
|
|
|
|
SkSVGPoly::SkSVGPoly(SkSVGTag t) : INHERITED(t) {}
|
|
|
|
void SkSVGPoly::setPoints(const SkSVGPointsType& pts) {
|
|
fPath.reset();
|
|
fPath.addPoly(pts.value().begin(),
|
|
pts.value().count(),
|
|
this->tag() == SkSVGTag::kPolygon); // only polygons are auto-closed
|
|
}
|
|
|
|
void SkSVGPoly::onSetAttribute(SkSVGAttribute attr, const SkSVGValue& v) {
|
|
switch (attr) {
|
|
case SkSVGAttribute::kPoints:
|
|
if (const auto* pts = v.as<SkSVGPointsValue>()) {
|
|
this->setPoints(*pts);
|
|
}
|
|
break;
|
|
default:
|
|
this->INHERITED::onSetAttribute(attr, v);
|
|
}
|
|
}
|
|
|
|
void SkSVGPoly::onDraw(SkCanvas* canvas, const SkSVGLengthContext&, const SkPaint& paint,
|
|
SkPath::FillType fillType) const {
|
|
// the passed fillType follows inheritance rules and needs to be applied at draw time.
|
|
fPath.setFillType(fillType);
|
|
canvas->drawPath(fPath, paint);
|
|
}
|
|
|
|
SkPath SkSVGPoly::onAsPath(const SkSVGRenderContext& ctx) const {
|
|
SkPath path = fPath;
|
|
|
|
// clip-rule can be inherited and needs to be applied at clip time.
|
|
path.setFillType(ctx.presentationContext().fInherited.fClipRule.get()->asFillType());
|
|
|
|
this->mapToParent(&path);
|
|
return path;
|
|
}
|