diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 00cf384..a95bcbc 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -14,7 +14,7 @@ on: default: 'false' env: - version: m91-b99622c05a-2 + version: m91-1a01201b77 jobs: macos: diff --git a/patches/11144_SkSVGDOM.patch b/patches/11144_SkSVGDOM.patch index 35fd65b..c37545f 100644 --- a/patches/11144_SkSVGDOM.patch +++ b/patches/11144_SkSVGDOM.patch @@ -1,8 +1,24 @@ diff --git a/modules/svg/src/SkSVGDOM.cpp b/modules/svg/src/SkSVGDOM.cpp -index 5f16e3ee43..2ec63ec8ca 100644 +index 7915654963..509c52548d 100644 --- a/modules/svg/src/SkSVGDOM.cpp +++ b/modules/svg/src/SkSVGDOM.cpp -@@ -473,6 +473,10 @@ const SkSize& SkSVGDOM::containerSize() const { +@@ -426,6 +426,15 @@ SkSVGDOM::SkSVGDOM(sk_sp root, sk_sp fmgr, + , fContainerSize(fRoot->intrinsicSize(SkSVGLengthContext(SkSize::Make(0, 0)))) + { + SkASSERT(fResourceProvider); ++ if (!fRoot->getViewBox().isValid() ++ && fRoot->getWidth().unit() != SkSVGLength::Unit::kPercentage ++ && fRoot->getHeight().unit() != SkSVGLength::Unit::kPercentage) ++ { ++ SkSVGLengthContext lctx(SkSize::Make(0, 0)); ++ SkScalar width = lctx.resolve(fRoot->getWidth(), SkSVGLengthContext::LengthType::kHorizontal); ++ SkScalar height = lctx.resolve(fRoot->getHeight(), SkSVGLengthContext::LengthType::kVertical); ++ fRoot->setViewBox(SkRect::MakeWH(width, height)); ++ } + } + + void SkSVGDOM::render(SkCanvas* canvas) const { +@@ -444,6 +453,10 @@ const SkSize& SkSVGDOM::containerSize() const { void SkSVGDOM::setContainerSize(const SkSize& containerSize) { // TODO: inval fContainerSize = containerSize;