[skottie] Switch to RapidJSON

- pull latest RapidJSON under third_party/externals/rapidjson
  (note: and older RS version is already pulled as part of angle2,
  and it is also checked in G3)

- add a thin Json porting layer (SkottieJson) to isolate RS
  idiosyncrasies

- convert Skottie to use the new helpers

- parse the DOM in-place (based on local experiments this is the
  fastest method)

Ta-da: Skottie now parses JSON ~10x faster!


Change-Id: Ida9099638f88ed025fee83055c8cd8680ee27176
Reviewed-on: https://skia-review.googlesource.com/125744
Commit-Queue: Florin Malita <fmalita@chromium.org>
Reviewed-by: Mike Reed <reed@google.com>

1 files changed, 4 insertions, 7 deletions

diff --git a/experimental/skottie/Skottie.h b/experimental/skottie/Skottie.h
index 44541fd81b..275127aa4e 100644
--- a/experimental/skottie/Skottie.h
+++ b/experimental/skottie/Skottie.h
@@ -11,8 +11,6 @@
 #include "SkRefCnt.h"
 #include "SkSize.h"
 #include "SkString.h"
-#include "SkTArray.h"
-#include "SkTHash.h"
 #include "SkTypes.h"
 
 #include <memory>
@@ -21,12 +19,12 @@ class SkCanvas;
 struct SkRect;
 class SkStream;
 
-namespace Json { class Value; }
-
 namespace sksg { class Scene;  }
 
 namespace skottie {
 
+namespace json { class ValueRef; }
+
 class ResourceProvider : public SkNoncopyable {
 public:
     virtual ~ResourceProvider() = default;
@@ -63,9 +61,8 @@ public:
     void setShowInval(bool show);
 
 private:
-    Animation(const ResourceProvider&,
-              SkString ver, const SkSize& size, SkScalar fps,
-              const Json::Value&, Stats*);
+    Animation(const ResourceProvider&, SkString ver, const SkSize& size, SkScalar fps,
+              const json::ValueRef&, Stats*);
 
     SkString                     fVersion;
     SkSize                       fSize;