commit c55c8c1e8e3de05bdd43f76e6e3582fec04c35ba
author Florin Malita <fmalita@chromium.org> Mon Jan 25 10:37:22 2021 -0500
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Mon Jan 25 16:40:16 2021 +0000
tree fec82218bc309396f5627bd04bef0c2e0016b373
parent bd91660b6e12640c6c3e3fe53e21acd8dd512b41

[svg] Generalize text shaping

In preparation for text bounding box support, fission the actual
rendering phase from the shaping/alignment phase:

  - rename onRenderText -> onShapeText
  - introduce a ShapedTextCallback abstraction for consuming the result
    of text processing
  - relocate the final rendering step to a ShapedTextCallback impl

Bug: skia:10840
Change-Id: Ia8cc0d9a5a5484972a34042fd782f9e4fada6b12
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/358223
Commit-Queue: Florin Malita <fmalita@google.com>
Commit-Queue: Florin Malita <fmalita@chromium.org>
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 1f45fd3..c446a21 100644
--- a/modules/svg/include/SkSVGText.h
+++ b/modules/svg/include/SkSVGText.h
@@ -23,8 +23,7 @@
 protected:
     explicit SkSVGTextFragment(SkSVGTag t) : INHERITED(t) {}
 
-    virtual void onRenderText(const SkSVGRenderContext&, SkSVGTextContext*,
-                              SkSVGXmlSpace) const = 0;
+    virtual void onShapeText(const SkSVGRenderContext&, SkSVGTextContext*, SkSVGXmlSpace) const = 0;
 
     // Text nodes other than the root <text> element are not rendered directly.
     void onRender(const SkSVGRenderContext&) const override {}
@@ -51,7 +50,7 @@
 protected:
     explicit SkSVGTextContainer(SkSVGTag t) : INHERITED(t) {}
 
-    void onRenderText(const SkSVGRenderContext&, SkSVGTextContext*, SkSVGXmlSpace) const override;
+    void onShapeText(const SkSVGRenderContext&, SkSVGTextContext*, SkSVGXmlSpace) const override;
 
     bool parseAndSetAttribute(const char*, const char*) override;
 
@@ -94,7 +93,7 @@
 private:
     SkSVGTextLiteral() : INHERITED(SkSVGTag::kTextLiteral) {}
 
-    void onRenderText(const SkSVGRenderContext&, SkSVGTextContext*, SkSVGXmlSpace) const override;
+    void onShapeText(const SkSVGRenderContext&, SkSVGTextContext*, SkSVGXmlSpace) const override;
 
     void appendChild(sk_sp<SkSVGNode>) override {}
 
@@ -111,7 +110,7 @@
 private:
     SkSVGTextPath() : INHERITED(SkSVGTag::kTextPath) {}
 
-    void onRenderText(const SkSVGRenderContext&, SkSVGTextContext*, SkSVGXmlSpace) const override;
+    void onShapeText(const SkSVGRenderContext&, SkSVGTextContext*, SkSVGXmlSpace) const override;
     bool parseAndSetAttribute(const char*, const char*) override;
 
     using INHERITED = SkSVGTextContainer;