commit 7006e15df59da479da9c8b93e7f5b1e5a1851e56
author Florin Malita <fmalita@chromium.org> Tue Nov 10 15:24:59 2020 -0500
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Wed Nov 11 01:51:44 2020 +0000
tree f3d321dff5e0d3f6c0d604db3d36309e341019f1
parent 24c18526a564e5dba4c2a92c632877704afc6784

[svg] Allow clients to pass a custom SkFontMgr

Introduce a Builder helper and plumb the client-provided SkFontMgr for
font resolution.

Also clean up some of the legacy SkSVGDom factories.

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

samplecode/SampleCowboy.cpp

diff --git a/samplecode/SampleCowboy.cpp b/samplecode/SampleCowboy.cpp
index 3cfb82d..62a72f2 100644
--- a/samplecode/SampleCowboy.cpp
+++ b/samplecode/SampleCowboy.cpp
@@ -47,13 +47,7 @@
         }
         SkMemoryStream svgStream(std::move(data));
 
-        SkDOM xmlDom;
-        if (!xmlDom.build(svgStream)) {
-            SkDebugf("XML parsing failed: \"%s\"\n", fResource);
-            return;
-        }
-
-        fDom = SkSVGDOM::MakeFromDOM(xmlDom);
+        fDom = SkSVGDOM::MakeFromStream(svgStream);
         if (fDom) {
             fDom->setContainerSize(SkSize::Make(this->width(), this->height()));
         }

samplecode/SampleSVGFile.cpp

diff --git a/samplecode/SampleSVGFile.cpp b/samplecode/SampleSVGFile.cpp
index c295e3a..bc1aaa9 100644
--- a/samplecode/SampleSVGFile.cpp
+++ b/samplecode/SampleSVGFile.cpp
@@ -33,13 +33,7 @@
             return;
         }
 
-        SkDOM xmlDom;
-        if (!xmlDom.build(svgStream)) {
-            SkDebugf("XML parsing failed: \"path\"\n", fPath.c_str());
-            return;
-        }
-
-        fDom = SkSVGDOM::MakeFromDOM(xmlDom);
+        fDom = SkSVGDOM::MakeFromStream(svgStream);
         if (fDom) {
             fDom->setContainerSize(SkSize::Make(this->width(), this->height()));
         }