commit 58628fdc3359c59aa391fd4726629f82ec05f5d2
author Mike Klein <mtklein@chromium.org> Thu Sep 21 16:01:07 2017 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Thu Sep 21 21:10:08 2017 +0000
tree 6b794c203706d74671240255805c8cb1f37259af
parent b97063b78a57513b46791ddb65c623da8a268651

ok, add via_skp

This is the same sort of thing as DM's serialize via.
It draws into a picture, serializes that, deserializes that,
and then draws that picture into the destination.

Change-Id: Ib58748786bc01fd8a0cb9355a2fd334311c361bf
Reviewed-on: https://skia-review.googlesource.com/49902
Reviewed-by: Herb Derby <herb@google.com>
Commit-Queue: Mike Klein <mtklein@chromium.org>

tools/ok_vias.cpp

diff --git a/tools/ok_vias.cpp b/tools/ok_vias.cpp
index c3c0bad..a2f4492 100644
--- a/tools/ok_vias.cpp
+++ b/tools/ok_vias.cpp
@@ -5,15 +5,17 @@
  * found in the LICENSE file.
  */
 
+#include "ProcStats.h"
 #include "SkEventTracingPriv.h"
 #include "SkImage.h"
 #include "SkOSFile.h"
 #include "SkPictureRecorder.h"
 #include "SkPngEncoder.h"
 #include "SkTraceEvent.h"
-#include "ProcStats.h"
+#include "SkTypeface.h"
 #include "Timer.h"
 #include "ok.h"
+#include "sk_tool_utils.h"
 #include <chrono>
 #include <regex>
 
@@ -49,10 +51,10 @@
         rec.beginRecording(SkRect::MakeSize(SkSize::Make(src->size())),
                            rtree ? &factory : nullptr);
 
-        for (auto status = src->draw(rec.getRecordingCanvas()); status != Status::OK; ) {
+        for (Status status = src->draw(rec.getRecordingCanvas()); status != Status::OK; ) {
             return status;
         }
-        auto pic = rec.finishRecordingAsPicture();
+        sk_sp<SkPicture> pic = rec.finishRecordingAsPicture();
 
         return target->draw(proxy(src, [=](SkCanvas* canvas) {
             pic->playback(canvas);
@@ -66,6 +68,55 @@
 };
 static Register via_pic{"via_pic", "record then play back an SkPicture", ViaPic::Create};
 
+// When deserializing, we need to hook this to intercept "Toy Liberation ..."
+// typefaces and return our portable test typeface.
+extern sk_sp<SkTypeface> (*gCreateTypefaceDelegate)(const char[], SkFontStyle);
+
+struct ViaSkp : Dst {
+    std::unique_ptr<Dst> target;
+    bool                 rtree = false;
+
+    static std::unique_ptr<Dst> Create(Options options, std::unique_ptr<Dst> dst) {
+        gCreateTypefaceDelegate = [](const char name[], SkFontStyle style) -> sk_sp<SkTypeface> {
+            if (name == strstr(name, "Toy Liberation")) {
+                return sk_tool_utils::create_portable_typeface(name, style);
+            }
+            return nullptr;
+        };
+
+        ViaSkp via;
+        via.target = std::move(dst);
+        if (options("bbh") == "rtree") { via.rtree = true; }
+        return move_unique(via);
+    }
+
+    Status draw(Src* src) override {
+        TRACE_EVENT0("ok", TRACE_FUNC);
+        SkRTreeFactory factory;
+        SkPictureRecorder rec;
+        rec.beginRecording(SkRect::MakeSize(SkSize::Make(src->size())),
+                           rtree ? &factory : nullptr);
+
+        for (Status status = src->draw(rec.getRecordingCanvas()); status != Status::OK; ) {
+            return status;
+        }
+        sk_sp<SkPicture> pic = rec.finishRecordingAsPicture();
+
+        // Serialize and deserialize.
+        pic = SkPicture::MakeFromData(pic->serialize().get());
+
+        return target->draw(proxy(src, [=](SkCanvas* canvas) {
+            pic->playback(canvas);
+            return Status::OK;
+        }).get());
+    }
+
+    sk_sp<SkImage> image() override {
+        return target->image();
+    }
+};
+static Register via_skp{"via_skp", "serialize and deserialize an .skp", ViaSkp::Create};
+
 struct Png : Dst {
     std::unique_ptr<Dst> target;
     std::string          dir;