diff options
| author | Florin Malita <fmalita@chromium.org> | 2019-01-10 15:24:15 -0500 |
|---|---|---|
| committer | Skia Commit-Bot <skia-commit-bot@chromium.org> | 2019-01-10 21:50:54 +0000 |
| commit | 760a052c1e75a2daeb5af11eb2429cb9b908646b (patch) | |
| tree | e6d7cc05f6d9fdb60f88232178503fe717f2561b /tools | |
| parent | 14e9177492e631a5e55132a0580ece0f45d48e79 (diff) | |
| download | platform_external_skqp-760a052c1e75a2daeb5af11eb2429cb9b908646b.tar.gz platform_external_skqp-760a052c1e75a2daeb5af11eb2429cb9b908646b.tar.bz2 platform_external_skqp-760a052c1e75a2daeb5af11eb2429cb9b908646b.zip | |
[sksg] Consolidate Matrix node implementations
Matrix and Matrix44 look almost identical -- consolidate as a template
class.
TBR=
Change-Id: I8f299a6138f190eb18de2e67b051307cf6a33383
Reviewed-on: https://skia-review.googlesource.com/c/182973
Reviewed-by: Florin Malita <fmalita@chromium.org>
Commit-Queue: Florin Malita <fmalita@chromium.org>
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/viewer/SlideDir.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/tools/viewer/SlideDir.cpp b/tools/viewer/SlideDir.cpp index 9be4bb5494..beb2ec2ae9 100644 --- a/tools/viewer/SlideDir.cpp +++ b/tools/viewer/SlideDir.cpp @@ -101,10 +101,10 @@ SkMatrix SlideMatrix(const sk_sp<Slide>& slide, const SkRect& dst) { } // namespace struct SlideDir::Rec { - sk_sp<Slide> fSlide; - sk_sp<sksg::RenderNode> fSlideRoot; - sk_sp<sksg::Matrix> fMatrix; - SkRect fRect; + sk_sp<Slide> fSlide; + sk_sp<sksg::RenderNode> fSlideRoot; + sk_sp<sksg::Matrix<SkMatrix>> fMatrix; + SkRect fRect; }; class SlideDir::FocusController final : public sksg::Animator { @@ -306,7 +306,7 @@ void SlideDir::load(SkScalar winWidth, SkScalar winHeight) { fCellSize.height()), slideRect = cell.makeInset(kPadding.width(), kPadding.height()); - auto slideMatrix = sksg::Matrix::Make(SlideMatrix(slide, slideRect)); + auto slideMatrix = sksg::Matrix<SkMatrix>::Make(SlideMatrix(slide, slideRect)); auto adapter = sk_make_sp<SlideAdapter>(slide); auto slideGrp = sksg::Group::Make(); slideGrp->addChild(sksg::Draw::Make(sksg::Rect::Make(SkRect::MakeIWH(slideSize.width(), |