...

include/tgfx/svg/SVGValue.h

@@ -73,11 +73,11 @@ class SVGWrapperValue final : public SVGValue {
     return &_wrappedValue;
   }
 
- private:
   // Stack-only
   void* operator new(size_t) = delete;
   void* operator new(size_t, void*) = delete;
 
+ private:
   const T& _wrappedValue;
 
   using INHERITED = SVGValue;

include/tgfx/svg/node/SVGClipPath.h

@@ -35,7 +35,7 @@ class SVGClipPath final : public SVGHiddenContainer {
   }
 
   SVG_ATTR(ClipPathUnits, SVGObjectBoundingBoxUnits,
-           SVGObjectBoundingBoxUnits(SVGObjectBoundingBoxUnits::Type::kUserSpaceOnUse))
+           SVGObjectBoundingBoxUnits(SVGObjectBoundingBoxUnits::Type::UserSpaceOnUse))
 
  private:
   friend class SVGRenderContext;

include/tgfx/svg/node/SVGFilter.h

@@ -37,14 +37,14 @@ class SkSVGFilter final : public SVGHiddenContainer {
 
   std::shared_ptr<ImageFilter> buildFilterDAG(const SVGRenderContext&) const;
 
-  SVG_ATTR(X, SVGLength, SVGLength(-10, SVGLength::Unit::kPercentage))
-  SVG_ATTR(Y, SVGLength, SVGLength(-10, SVGLength::Unit::kPercentage))
-  SVG_ATTR(Width, SVGLength, SVGLength(120, SVGLength::Unit::kPercentage))
-  SVG_ATTR(Height, SVGLength, SVGLength(120, SVGLength::Unit::kPercentage))
+  SVG_ATTR(X, SVGLength, SVGLength(-10, SVGLength::Unit::Percentage))
+  SVG_ATTR(Y, SVGLength, SVGLength(-10, SVGLength::Unit::Percentage))
+  SVG_ATTR(Width, SVGLength, SVGLength(120, SVGLength::Unit::Percentage))
+  SVG_ATTR(Height, SVGLength, SVGLength(120, SVGLength::Unit::Percentage))
   SVG_ATTR(FilterUnits, SVGObjectBoundingBoxUnits,
-           SVGObjectBoundingBoxUnits(SVGObjectBoundingBoxUnits::Type::kObjectBoundingBox))
+           SVGObjectBoundingBoxUnits(SVGObjectBoundingBoxUnits::Type::ObjectBoundingBox))
   SVG_ATTR(PrimitiveUnits, SVGObjectBoundingBoxUnits,
-           SVGObjectBoundingBoxUnits(SVGObjectBoundingBoxUnits::Type::kUserSpaceOnUse))
+           SVGObjectBoundingBoxUnits(SVGObjectBoundingBoxUnits::Type::UserSpaceOnUse))
 
  private:
   SkSVGFilter() : INHERITED(SVGTag::Filter) {

include/tgfx/svg/node/SVGGradient.h

@@ -34,9 +34,9 @@ class SkSVGGradient : public SVGHiddenContainer {
  public:
   SVG_ATTR(Href, SVGIRI, SVGIRI())
   SVG_ATTR(GradientTransform, SVGTransformType, SVGTransformType(Matrix::I()))
-  SVG_ATTR(SpreadMethod, SVGSpreadMethod, SVGSpreadMethod(SVGSpreadMethod::Type::kPad))
+  SVG_ATTR(SpreadMethod, SVGSpreadMethod, SVGSpreadMethod(SVGSpreadMethod::Type::Pad))
   SVG_ATTR(GradientUnits, SVGObjectBoundingBoxUnits,
-           SVGObjectBoundingBoxUnits(SVGObjectBoundingBoxUnits::Type::kObjectBoundingBox))
+           SVGObjectBoundingBoxUnits(SVGObjectBoundingBoxUnits::Type::ObjectBoundingBox))
 
  protected:
   explicit SkSVGGradient(SVGTag t) : INHERITED(t) {

include/tgfx/svg/node/SVGLinearGradient.h

@@ -32,10 +32,10 @@ class SkSVGLinearGradient final : public SkSVGGradient {
     return std::shared_ptr<SkSVGLinearGradient>(new SkSVGLinearGradient());
   }
 
-  SVG_ATTR(X1, SVGLength, SVGLength(0, SVGLength::Unit::kPercentage))
-  SVG_ATTR(Y1, SVGLength, SVGLength(0, SVGLength::Unit::kPercentage))
-  SVG_ATTR(X2, SVGLength, SVGLength(100, SVGLength::Unit::kPercentage))
-  SVG_ATTR(Y2, SVGLength, SVGLength(0, SVGLength::Unit::kPercentage))
+  SVG_ATTR(X1, SVGLength, SVGLength(0, SVGLength::Unit::Percentage))
+  SVG_ATTR(Y1, SVGLength, SVGLength(0, SVGLength::Unit::Percentage))
+  SVG_ATTR(X2, SVGLength, SVGLength(100, SVGLength::Unit::Percentage))
+  SVG_ATTR(Y2, SVGLength, SVGLength(0, SVGLength::Unit::Percentage))
 
  protected:
   bool parseAndSetAttribute(const char*, const char*) override;

include/tgfx/svg/node/SVGMask.h

@@ -37,9 +37,9 @@ class SkSVGMask final : public SVGHiddenContainer {
   SVG_OPTIONAL_ATTR(Height, SVGLength)
 
   SVG_ATTR(MaskUnits, SVGObjectBoundingBoxUnits,
-           SVGObjectBoundingBoxUnits(SVGObjectBoundingBoxUnits::Type::kObjectBoundingBox))
+           SVGObjectBoundingBoxUnits(SVGObjectBoundingBoxUnits::Type::ObjectBoundingBox))
   SVG_ATTR(MaskContentUnits, SVGObjectBoundingBoxUnits,
-           SVGObjectBoundingBoxUnits(SVGObjectBoundingBoxUnits::Type::kUserSpaceOnUse))
+           SVGObjectBoundingBoxUnits(SVGObjectBoundingBoxUnits::Type::UserSpaceOnUse))
 
  private:
   friend class SVGRenderContext;

include/tgfx/svg/node/SVGPattern.h

@@ -40,9 +40,9 @@ class SkSVGPattern final : public SVGHiddenContainer {
   SVG_OPTIONAL_ATTR(Height, SVGLength)
   SVG_OPTIONAL_ATTR(PatternTransform, SVGTransformType)
   SVG_ATTR(PatternUnits, SVGObjectBoundingBoxUnits,
-           SVGObjectBoundingBoxUnits(SVGObjectBoundingBoxUnits::Type::kObjectBoundingBox))
+           SVGObjectBoundingBoxUnits(SVGObjectBoundingBoxUnits::Type::ObjectBoundingBox))
   SVG_ATTR(ContentUnits, SVGObjectBoundingBoxUnits,
-           SVGObjectBoundingBoxUnits(SVGObjectBoundingBoxUnits::Type::kUserSpaceOnUse))
+           SVGObjectBoundingBoxUnits(SVGObjectBoundingBoxUnits::Type::UserSpaceOnUse))
 
  protected:
   SkSVGPattern();

include/tgfx/svg/node/SVGRadialGradient.h

@@ -33,9 +33,9 @@ class SkSVGRadialGradient final : public SkSVGGradient {
     return std::shared_ptr<SkSVGRadialGradient>(new SkSVGRadialGradient());
   }
 
-  SVG_ATTR(Cx, SVGLength, SVGLength(50, SVGLength::Unit::kPercentage))
-  SVG_ATTR(Cy, SVGLength, SVGLength(50, SVGLength::Unit::kPercentage))
-  SVG_ATTR(R, SVGLength, SVGLength(50, SVGLength::Unit::kPercentage))
+  SVG_ATTR(Cx, SVGLength, SVGLength(50, SVGLength::Unit::Percentage))
+  SVG_ATTR(Cy, SVGLength, SVGLength(50, SVGLength::Unit::Percentage))
+  SVG_ATTR(R, SVGLength, SVGLength(50, SVGLength::Unit::Percentage))
   SVG_OPTIONAL_ATTR(Fx, SVGLength)
   SVG_OPTIONAL_ATTR(Fy, SVGLength)
 

include/tgfx/svg/node/SVGSVG.h

@@ -39,8 +39,8 @@ class SVGSVG : public SkSVGContainer {
 
   SVG_ATTR(X, SVGLength, SVGLength(0))
   SVG_ATTR(Y, SVGLength, SVGLength(0))
-  SVG_ATTR(Width, SVGLength, SVGLength(100, SVGLength::Unit::kPercentage))
-  SVG_ATTR(Height, SVGLength, SVGLength(100, SVGLength::Unit::kPercentage))
+  SVG_ATTR(Width, SVGLength, SVGLength(100, SVGLength::Unit::Percentage))
+  SVG_ATTR(Height, SVGLength, SVGLength(100, SVGLength::Unit::Percentage))
   SVG_ATTR(PreserveAspectRatio, SVGPreserveAspectRatio, SVGPreserveAspectRatio())
 
   SVG_OPTIONAL_ATTR(ViewBox, SVGViewBoxType)

include/tgfx/svg/node/SVGStop.h

@@ -33,7 +33,7 @@ class SkSVGStop : public SVGHiddenContainer {
     return std::shared_ptr<SkSVGStop>(new SkSVGStop());
   }
 
-  SVG_ATTR(Offset, SVGLength, SVGLength(0, SVGLength::Unit::kPercentage))
+  SVG_ATTR(Offset, SVGLength, SVGLength(0, SVGLength::Unit::Percentage))
 
  protected:
   bool parseAndSetAttribute(const char*, const char*) override;

src/svg/SVGAttribute.cpp

@@ -25,28 +25,28 @@ SVGPresentationAttributes SVGPresentationAttributes::MakeInitial() {
 
   result.fFill.set(SVGPaint(SVGColor(Color::Black())));
   result.fFillOpacity.set(static_cast<SVGNumberType>(1));
-  result.fFillRule.set(SVGFillRule(SVGFillRule::Type::kNonZero));
-  result.fClipRule.set(SVGFillRule(SVGFillRule::Type::kNonZero));
+  result.fFillRule.set(SVGFillRule(SVGFillRule::Type::NonZero));
+  result.fClipRule.set(SVGFillRule(SVGFillRule::Type::NonZero));
 
-  result.fStroke.set(SVGPaint(SVGPaint::Type::kNone));
-  result.fStrokeDashArray.set(SVGDashArray(SVGDashArray::Type::kNone));
+  result.fStroke.set(SVGPaint(SVGPaint::Type::None));
+  result.fStrokeDashArray.set(SVGDashArray(SVGDashArray::Type::None));
   result.fStrokeDashOffset.set(SVGLength(0));
-  result.fStrokeLineCap.set(SVGLineCap::kButt);
-  result.fStrokeLineJoin.set(SVGLineJoin(SVGLineJoin::Type::kMiter));
+  result.fStrokeLineCap.set(SVGLineCap::Butt);
+  result.fStrokeLineJoin.set(SVGLineJoin(SVGLineJoin::Type::Miter));
   result.fStrokeMiterLimit.set(static_cast<SVGNumberType>(4));
   result.fStrokeOpacity.set(static_cast<SVGNumberType>(1));
   result.fStrokeWidth.set(SVGLength(1));
 
-  result.fVisibility.set(SVGVisibility(SVGVisibility::Type::kVisible));
+  result.fVisibility.set(SVGVisibility(SVGVisibility::Type::Visible));
 
   result.fColor.set(SVGColorType(Color::Black()));
   result.fColorInterpolation.set(SVGColorspace::kSRGB);
   result.fColorInterpolationFilters.set(SVGColorspace::kLinearRGB);
 
   result.fFontFamily.init("default");
-  result.fFontStyle.init(SVGFontStyle::Type::kNormal);
+  result.fFontStyle.init(SVGFontStyle::Type::Normal);
   result.fFontSize.init(SVGLength(24));
-  result.fFontWeight.init(SVGFontWeight::Type::kNormal);
+  result.fFontWeight.init(SVGFontWeight::Type::Normal);
   result.fTextAnchor.init(SVGTextAnchor::Type::kStart);
 
   result.fDisplay.init(SVGDisplay::kInline);