commit 39fe8c86fa62337f8dfb428af1cd66acd365dceb
author Florin Malita <fmalita@chromium.org> Tue Oct 20 10:43:03 2020 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Tue Oct 20 16:04:41 2020 +0000
tree 0a200d81f44e1bb577023847443d9d760b69a679
parent 1c823674d957ad8cadf577c3bdc4039d8821be2e

[svg] Parse text attributes

Convert font-family, font-size, font-style and font-weight to
presentation attributes, and add parsing utils.

Bug: skia:10840
Change-Id: I1acdb59bc95fe46e67ed0f499dd0732420016663
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/328436
Commit-Queue: Florin Malita <fmalita@google.com>
Reviewed-by: Tyler Denniston <tdenniston@google.com>

modules/svg/include/SkSVGText.h

diff --git a/modules/svg/include/SkSVGText.h b/modules/svg/include/SkSVGText.h
index 9336f73..55716cd 100644
--- a/modules/svg/include/SkSVGText.h
+++ b/modules/svg/include/SkSVGText.h
@@ -10,12 +10,12 @@
 
 #include "include/core/SkFont.h"
 #include "include/utils/SkTextUtils.h"
-#include "modules/svg/include/SkSVGShape.h"
+#include "modules/svg/include/SkSVGTransformableNode.h"
 #include "modules/svg/include/SkSVGTypes.h"
 
 class SkRRect;
 
-class SkSVGText final : public SkSVGShape {
+class SkSVGText final : public SkSVGTransformableNode {
  public:
   ~SkSVGText() override = default;
   static sk_sp<SkSVGText> Make() {
@@ -23,18 +23,14 @@
 
   void setX(const SkSVGLength&);
   void setY(const SkSVGLength&);
-  void setFontFamily(const SkSVGStringType&);
-  void setFontSize(const SkSVGLength&);
-  void setFontStyle(const SkSVGStringType&);
-  void setFontWeight(const SkSVGStringType&);
   void setText(const SkSVGStringType&);
   void setTextAnchor(const SkSVGStringType&);
 
  protected:
   void onSetAttribute(SkSVGAttribute, const SkSVGValue&) override;
 
-  void onDraw(SkCanvas*, const SkSVGLengthContext&, const SkPaint&,
-              SkPathFillType) const override;
+  void onRender(const SkSVGRenderContext&) const override;
+  void appendChild(sk_sp<SkSVGNode>) override;
 
   SkPath onAsPath(const SkSVGRenderContext&) const override;
 
@@ -42,16 +38,16 @@
 
  private:
   SkSVGText();
-  SkSVGLength fX = SkSVGLength(0);
-  SkSVGLength fY = SkSVGLength(0);
-  SkSVGStringType fText;
-  sk_sp<SkTypeface> fTypeface;
-  SkSVGLength fFontSize;
-  SkSVGStringType fFontFamily;
-  SkSVGStringType fFontStyle;
-  SkSVGStringType fFontWeight;
+
+  SkFont resolveFont(const SkSVGRenderContext&) const;
+
+  SkSVGLength        fX = SkSVGLength(0);
+  SkSVGLength        fY = SkSVGLength(0);
+  SkSVGStringType    fText;
+  sk_sp<SkTypeface>  fTypeface;
   SkTextUtils::Align fTextAlign = SkTextUtils::Align::kLeft_Align;
-  using INHERITED = SkSVGShape;
+
+  using INHERITED = SkSVGTransformableNode;
 };
 
 #endif  // SkSVGText_DEFINED