commit 3e7d511de3340efbd791e148d3e18b51c68ec625
author Chris Dalton <csmartdalton@google.com> Thu May 28 14:04:53 2020 -0600
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Thu May 28 20:39:43 2020 +0000
tree fade150cc5b9616816454d793a1ff1caaf58edd3
parent cf11892ab235aeaf1e7f294c7f9dfd4b2b209ebb

Add svg parsing to CanvasKit viewer.html

Also enables ccpr and makes flags parsing more robust.

Change-Id: Ia98467403de87423a63167681b2ee635b0fa593a
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/292690
Commit-Queue: Chris Dalton <csmartdalton@google.com>
Reviewed-by: Kevin Lubick <kjlubick@google.com>

tools/viewer/SvgSlide.cpp

diff --git a/tools/viewer/SvgSlide.cpp b/tools/viewer/SvgSlide.cpp
index 3779ffd..c420843 100644
--- a/tools/viewer/SvgSlide.cpp
+++ b/tools/viewer/SvgSlide.cpp
@@ -14,18 +14,26 @@
 #include "include/core/SkStream.h"
 
 SvgSlide::SvgSlide(const SkString& name, const SkString& path)
-    : fPath(path) {
+        : SvgSlide(name, SkStream::MakeFromFile(path.c_str())) {
+}
+
+SvgSlide::SvgSlide(const SkString& name, std::unique_ptr<SkStream> stream)
+        : fStream(std::move(stream)) {
     fName = name;
 }
 
 void SvgSlide::load(SkScalar w, SkScalar h) {
-    fWinSize   = SkSize::Make(w, h);
+    if (!fStream) {
+        SkDebugf("No svg stream for slide %s.\n", fName.c_str());
+        return;
+    }
 
-    if (const auto svgStream =  SkStream::MakeFromFile(fPath.c_str())) {
-        fDom = SkSVGDOM::MakeFromStream(*svgStream);
-        if (fDom) {
-            fDom->setContainerSize(fWinSize);
-        }
+    fWinSize = SkSize::Make(w, h);
+
+    fStream->rewind();
+    fDom = SkSVGDOM::MakeFromStream(*fStream);
+    if (fDom) {
+        fDom->setContainerSize(fWinSize);
     }
 }
 

tools/viewer/SvgSlide.h

diff --git a/tools/viewer/SvgSlide.h b/tools/viewer/SvgSlide.h
index ccc840e..6a15a30 100644
--- a/tools/viewer/SvgSlide.h
+++ b/tools/viewer/SvgSlide.h
@@ -15,6 +15,7 @@
 class SvgSlide final : public Slide {
 public:
     SvgSlide(const SkString& name, const SkString& path);
+    SvgSlide(const SkString& name, std::unique_ptr<SkStream>);
 
     void load(SkScalar winWidth, SkScalar winHeight) override;
     void unload() override;
@@ -24,9 +25,8 @@
 
     void draw(SkCanvas*) override;
 private:
-    const SkString  fPath;
-
-    SkSize          fWinSize = SkSize::MakeEmpty();
+    std::unique_ptr<SkStream> fStream;
+    SkSize fWinSize = SkSize::MakeEmpty();
     sk_sp<SkSVGDOM> fDom;
 
     typedef Slide INHERITED;