aboutsummaryrefslogtreecommitdiffhomepage
path: root/experimental/sksg/geometry/SkSGMerge.h
diff options
context:
space:
mode:
authorGravatar Florin Malita <fmalita@chromium.org>2018-01-31 17:06:59 -0500
committerGravatar Skia Commit-Bot <skia-commit-bot@chromium.org>2018-01-31 22:36:05 +0000
commit51012ce332016cca5160b5a63b91a04b6cb56899 (patch)
tree5ad31e213c9d4adacae77c16c648f98d3f34739b /experimental/sksg/geometry/SkSGMerge.h
parent28a110c68e8c6f96dc699011762d02b4e4c5b8e5 (diff)
[sksg] Initial text support
Use the new node type for SkottieSlide2 labels. TBR= Change-Id: Icd6a4faf1c281bd83a2331c0072d1a6ed71acc09 Reviewed-on: https://skia-review.googlesource.com/102441 Reviewed-by: Florin Malita <fmalita@chromium.org> Commit-Queue: Florin Malita <fmalita@chromium.org>
Diffstat (limited to 'experimental/sksg/geometry/SkSGMerge.h')
-rw-r--r--experimental/sksg/geometry/SkSGMerge.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/experimental/sksg/geometry/SkSGMerge.h b/experimental/sksg/geometry/SkSGMerge.h
index 69f824e011..54924d6475 100644
--- a/experimental/sksg/geometry/SkSGMerge.h
+++ b/experimental/sksg/geometry/SkSGMerge.h
@@ -55,6 +55,8 @@ private:
std::vector<sk_sp<GeometryNode>> fGeos;
SkPath fMerged;
Mode fMode;
+
+ using INHERITED = GeometryNode;
};
} // namespace sksg