commit fa8d49adfa8d592219e9ac999c54e87969aa817d
author Florin Malita <fmalita@chromium.org> Fri Dec 29 11:52:44 2017 -0500
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Fri Dec 29 17:12:11 2017 +0000
tree f464556de9280e5ae43f57b0aec07417612c9711
parent d1e268cfa1c4d2d56ea04f09576220f3841cc0a1

[sksg] Refactor stroke logic

Instead of a specialized node, hoist attributes to base class.

TBR=
Change-Id: I4fa5a24dfc899307a8603577738972ebd32f57f5
Reviewed-on: https://skia-review.googlesource.com/89903
Reviewed-by: Florin Malita <fmalita@chromium.org>
Commit-Queue: Florin Malita <fmalita@chromium.org>

experimental/sksg/SkSGPaintNode.h

diff --git a/experimental/sksg/SkSGPaintNode.h b/experimental/sksg/SkSGPaintNode.h
index d0a7787..534ad55 100644
--- a/experimental/sksg/SkSGPaintNode.h
+++ b/experimental/sksg/SkSGPaintNode.h
@@ -22,18 +22,31 @@
  */
 class PaintNode : public Node {
 public:
-
     const SkPaint& makePaint();
 
+    SG_ATTRIBUTE(AntiAlias  , bool          , fAntiAlias  )
+    SG_ATTRIBUTE(StrokeWidth, SkScalar      , fStrokeWidth)
+    SG_ATTRIBUTE(StrokeMiter, SkScalar      , fStrokeMiter)
+    SG_ATTRIBUTE(Style      , SkPaint::Style, fStyle      )
+    SG_ATTRIBUTE(StrokeJoin , SkPaint::Join , fStrokeJoin )
+    SG_ATTRIBUTE(StrokeCap  , SkPaint::Cap  , fStrokeCap  )
+
 protected:
     PaintNode();
 
-    virtual SkPaint onMakePaint() const = 0;
+    virtual void onApplyToPaint(SkPaint*) const = 0;
 
     void onRevalidate(InvalidationController*, const SkMatrix&) override;
 
 private:
-    SkPaint fPaint;
+    SkPaint        fPaint;
+
+    SkScalar       fStrokeWidth = 1,
+                   fStrokeMiter = 4;
+    bool           fAntiAlias   = false;
+    SkPaint::Style fStyle       = SkPaint::kFill_Style;
+    SkPaint::Join  fStrokeJoin  = SkPaint::kMiter_Join;
+    SkPaint::Cap   fStrokeCap   = SkPaint::kButt_Cap;
 
     typedef Node INHERITED;
 };