commit 4c6f57a23e63d9a3ab0509798ce3adbbf10e03ec
author Tyler Denniston <tdenniston@google.com> Mon Nov 30 15:31:32 2020 -0500
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Mon Nov 30 21:27:04 2020 +0000
tree 40480c91a953964b969a34048d41a92b6d762092
parent 70fe17e12f3871351c3dbcf9f3a86a1918146f8e

[svg] Use new code path for rest of presentation attrs

This is another necessary step in order to remove kInherit from all of
the base SVG type enums.

Change-Id: I2185e744f7b27369f7bad36591f896d3a9982b42
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/335817
Commit-Queue: Tyler Denniston <tdenniston@google.com>
Reviewed-by: Florin Malita <fmalita@chromium.org>

modules/svg/include/SkSVGNode.h

diff --git a/modules/svg/include/SkSVGNode.h b/modules/svg/include/SkSVGNode.h
index 7478c7f..ac74ae2 100644
--- a/modules/svg/include/SkSVGNode.h
+++ b/modules/svg/include/SkSVGNode.h
@@ -94,32 +94,31 @@
     // TODO: consolidate with existing setAttribute
     virtual bool parseAndSetAttribute(const char* name, const char* value);
 
-    void setColor(const SkSVGColorType&);
-    void setFillOpacity(const SkSVGNumberType&);
-    void setOpacity(const SkSVGNumberType&);
-    void setStrokeDashOffset(const SkSVGLength&);
-    void setStrokeOpacity(const SkSVGNumberType&);
-    void setStrokeMiterLimit(const SkSVGNumberType&);
-    void setStrokeWidth(const SkSVGLength&);
-
     // inherited
-    SVG_PRES_ATTR(ClipRule       , SkSVGFillRule  , true)
-    SVG_PRES_ATTR(FillRule       , SkSVGFillRule  , true)
-    SVG_PRES_ATTR(Fill           , SkSVGPaint     , true)
-    SVG_PRES_ATTR(FontFamily     , SkSVGFontFamily, true)
-    SVG_PRES_ATTR(FontSize       , SkSVGFontSize  , true)
-    SVG_PRES_ATTR(FontStyle      , SkSVGFontStyle , true)
-    SVG_PRES_ATTR(FontWeight     , SkSVGFontWeight, true)
-    SVG_PRES_ATTR(Stroke         , SkSVGPaint     , true)
-    SVG_PRES_ATTR(StrokeDashArray, SkSVGDashArray , true)
-    SVG_PRES_ATTR(StrokeLineCap  , SkSVGLineCap   , true)
-    SVG_PRES_ATTR(StrokeLineJoin , SkSVGLineJoin  , true)
-    SVG_PRES_ATTR(TextAnchor     , SkSVGTextAnchor, true)
-    SVG_PRES_ATTR(Visibility     , SkSVGVisibility, true)
+    SVG_PRES_ATTR(ClipRule        , SkSVGFillRule  , true)
+    SVG_PRES_ATTR(Color           , SkSVGColorType , true)
+    SVG_PRES_ATTR(FillRule        , SkSVGFillRule  , true)
+    SVG_PRES_ATTR(Fill            , SkSVGPaint     , true)
+    SVG_PRES_ATTR(FillOpacity     , SkSVGNumberType, true)
+    SVG_PRES_ATTR(FontFamily      , SkSVGFontFamily, true)
+    SVG_PRES_ATTR(FontSize        , SkSVGFontSize  , true)
+    SVG_PRES_ATTR(FontStyle       , SkSVGFontStyle , true)
+    SVG_PRES_ATTR(FontWeight      , SkSVGFontWeight, true)
+    SVG_PRES_ATTR(Stroke          , SkSVGPaint     , true)
+    SVG_PRES_ATTR(StrokeDashArray , SkSVGDashArray , true)
+    SVG_PRES_ATTR(StrokeDashOffset, SkSVGLength    , true)
+    SVG_PRES_ATTR(StrokeLineCap   , SkSVGLineCap   , true)
+    SVG_PRES_ATTR(StrokeLineJoin  , SkSVGLineJoin  , true)
+    SVG_PRES_ATTR(StrokeMiterLimit, SkSVGNumberType, true)
+    SVG_PRES_ATTR(StrokeOpacity   , SkSVGNumberType, true)
+    SVG_PRES_ATTR(StrokeWidth     , SkSVGLength    , true)
+    SVG_PRES_ATTR(TextAnchor      , SkSVGTextAnchor, true)
+    SVG_PRES_ATTR(Visibility      , SkSVGVisibility, true)
 
     // not inherited
-    SVG_PRES_ATTR(ClipPath       , SkSVGClip      , false)
-    SVG_PRES_ATTR(Filter         , SkSVGFilterType, false)
+    SVG_PRES_ATTR(ClipPath        , SkSVGClip      , false)
+    SVG_PRES_ATTR(Filter          , SkSVGFilterType, false)
+    SVG_PRES_ATTR(Opacity         , SkSVGNumberType, false)
 
 protected:
     SkSVGNode(SkSVGTag);
@@ -138,7 +137,7 @@
 
     virtual SkPath onAsPath(const SkSVGRenderContext&) const = 0;
 
-    virtual void onSetAttribute(SkSVGAttribute, const SkSVGValue&);
+    virtual void onSetAttribute(SkSVGAttribute, const SkSVGValue&) {}
 
     virtual bool hasChildren() const { return false; }