From 91664594bec2685810a350b1c53370a9b6829d14 Mon Sep 17 00:00:00 2001 From: Nikita Prokopov Date: Tue, 10 Aug 2021 17:09:14 +0200 Subject: [PATCH] m93-87e8842e8c --- .github/workflows/build.yml | 2 +- patches/11144_SkSVGDOM.patch | 39 ------------------------------------ 2 files changed, 1 insertion(+), 40 deletions(-) delete mode 100644 patches/11144_SkSVGDOM.patch diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index a965a14..1c756de 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -14,7 +14,7 @@ on: default: 'false' env: - version: m92-d9b8efde6d + version: m93-87e8842e8c jobs: macos: diff --git a/patches/11144_SkSVGDOM.patch b/patches/11144_SkSVGDOM.patch deleted file mode 100644 index 488f346..0000000 --- a/patches/11144_SkSVGDOM.patch +++ /dev/null @@ -1,39 +0,0 @@ -diff --git a/modules/svg/include/SkSVGDOM.h b/modules/svg/include/SkSVGDOM.h -index c9e0b312dc..a9cc540e43 100644 ---- a/modules/svg/include/SkSVGDOM.h -+++ b/modules/svg/include/SkSVGDOM.h -@@ -46,8 +46,33 @@ public: - return Builder().make(str); - } - -- const SkSize& containerSize() const; -+ /** -+ * Returns the root (outermost) SVG element. -+ */ -+ SkSVGSVG* getRoot() const { return fRoot.get(); } -+ /** -+ * Specify a "container size" for the SVG dom. -+ * -+ * This is used to resolve the initial viewport when the root SVG width/height are specified -+ * in relative units. -+ * -+ * If the root dimensions are in absolute units, then the container size has no effect since -+ * the initial viewport is fixed. -+ */ - void setContainerSize(const SkSize&); -+ /** -+ * DEPRECATED: use getRoot()->intrinsicSize() to query the root element intrinsic size. -+ * -+ * Returns the SVG dom container size. -+ * -+ * If the client specified a container size via setContainerSize(), then the same size is -+ * returned. -+ * -+ * When unspecified by clients, this returns the intrinsic size of the root element, as defined -+ * by its width/height attributes. If either width or height is specified in relative units -+ * (e.g. "100%"), then the corresponding intrinsic size dimension is zero. -+ */ -+ const SkSize& containerSize() const; - - // Returns the node with the given id, or nullptr if not found. - sk_sp* findNodeById(const char* id);