diff options
Diffstat (limited to 'experimental/sksg')
-rw-r--r-- | experimental/sksg/SkSGNode.h | 10 | ||||
-rw-r--r-- | experimental/sksg/geometry/SkSGPath.cpp | 8 | ||||
-rw-r--r-- | experimental/sksg/geometry/SkSGPath.h | 1 |
3 files changed, 17 insertions, 2 deletions
diff --git a/experimental/sksg/SkSGNode.h b/experimental/sksg/SkSGNode.h index 6396e4d33e..17619de485 100644 --- a/experimental/sksg/SkSGNode.h +++ b/experimental/sksg/SkSGNode.h @@ -92,7 +92,15 @@ private: if (attr_container == v) return; \ attr_container = v; \ this->invalidate(); \ - } + } + +#define SG_MAPPED_ATTRIBUTE(attr_name, attr_type, attr_container) \ + attr_type get##attr_name() const { return attr_container.get##attr_name(); } \ + void set##attr_name(const attr_type& v) { \ + if (attr_container.get##attr_name() == v) return; \ + attr_container.set##attr_name(v); \ + this->invalidate(); \ + } } // namespace sksg diff --git a/experimental/sksg/geometry/SkSGPath.cpp b/experimental/sksg/geometry/SkSGPath.cpp index 8d5a25373a..230442d409 100644 --- a/experimental/sksg/geometry/SkSGPath.cpp +++ b/experimental/sksg/geometry/SkSGPath.cpp @@ -9,6 +9,7 @@ #include "SkCanvas.h" #include "SkPaint.h" +#include "SkRectPriv.h" namespace sksg { @@ -25,7 +26,12 @@ void Path::onDraw(SkCanvas* canvas, const SkPaint& paint) const { SkRect Path::onRevalidate(InvalidationController*, const SkMatrix&) { SkASSERT(this->hasInval()); - return fPath.computeTightBounds(); + const auto ft = fPath.getFillType(); + return (ft == SkPath::kWinding_FillType || ft == SkPath::kEvenOdd_FillType) + // "Containing" fills have finite bounds. + ? fPath.computeTightBounds() + // Inverse fills are "infinite". + : SkRectPriv::MakeLargeS32(); } SkPath Path::onAsPath() const { diff --git a/experimental/sksg/geometry/SkSGPath.h b/experimental/sksg/geometry/SkSGPath.h index a398e2f0a4..1a8718868d 100644 --- a/experimental/sksg/geometry/SkSGPath.h +++ b/experimental/sksg/geometry/SkSGPath.h @@ -26,6 +26,7 @@ public: static sk_sp<Path> Make(const SkPath& r) { return sk_sp<Path>(new Path(r)); } SG_ATTRIBUTE(Path, SkPath, fPath) + SG_MAPPED_ATTRIBUTE(FillType, SkPath::FillType, fPath) protected: void onClip(SkCanvas*, bool antiAlias) const override; |