commit 1f4cd07af88a6554bba83f656854ee58e020cf46
author Tyler Denniston <tdenniston@google.com> Fri Feb 05 09:08:33 2021 -0500
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Fri Feb 05 15:59:10 2021 +0000
tree a14a862a47e4e4f5b749ee05b703b1c9d9d7254e
parent 3f14d28b5934f16cc2dd75c294e0e9680f87df87

[svg] Support preserveAspectRatio for images

https://www.w3.org/TR/SVG11/struct.html#ImageElement
https://www.w3.org/TR/SVG11/coords.html#PreserveAspectRatioAttribute

We already had a function to compute the appropriate matrix, and since
we can share the functionality with other elements that establish a new
viewport (including svg, symbol, and a few others), this CL moves the
function to the SVG node base class.

Relevant test for images is struct-image-06.

Bug: skia:10842
Change-Id: I5d6261210d03959e28d0bd7189da7f4ea53abc03
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/366398
Commit-Queue: Tyler Denniston <tdenniston@google.com>
Reviewed-by: Florin Malita <fmalita@chromium.org>

modules/svg/include/SkSVGNode.h

diff --git a/modules/svg/include/SkSVGNode.h b/modules/svg/include/SkSVGNode.h
index 16fbbe2..c4da7d5 100644
--- a/modules/svg/include/SkSVGNode.h
+++ b/modules/svg/include/SkSVGNode.h
@@ -146,6 +146,8 @@
 protected:
     SkSVGNode(SkSVGTag);
 
+    static SkMatrix ComputeViewboxMatrix(const SkRect&, const SkRect&, SkSVGPreserveAspectRatio);
+
     // Called before onRender(), to apply local attributes to the context.  Unlike onRender(),
     // onPrepareToRender() bubbles up the inheritance chain: overriders should always call
     // INHERITED::onPrepareToRender(), unless they intend to short-circuit rendering