Skip to content

Commit

Permalink
Move to m92-81ce29695f
Browse files Browse the repository at this point in the history
  • Loading branch information
olonho committed Jun 8, 2021
1 parent 150a597 commit 57e7904
Show file tree
Hide file tree
Showing 5 changed files with 44 additions and 19 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ on:
default: 'false'

env:
version: m91-1a01201b77
version: m92-81ce29695f

jobs:
macos:
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,15 +13,15 @@ Update `version` in [.github/workflows/build.yml](https://github.com/JetBrains/s
## Building locally

```sh
python3 script/checkout.py --version m91-1a01201b77
python3 script/checkout.py --version m92-81ce29695f
python3 script/build.py
python3 script/archive.py
```

To build a debug build:

```sh
python3 script/checkout.py --version m91-1a01201b77
python3 script/checkout.py --version m92-81ce29695f
python3 script/build.py --build-type Debug
python3 script/archive.py --build-type Debug
```
14 changes: 0 additions & 14 deletions patches/GrMtlUtil.patch

This file was deleted.

39 changes: 39 additions & 0 deletions patches/SkSVGDOM.h.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
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<SkSVGNode>* findNodeById(const char* id);
4 changes: 2 additions & 2 deletions script/update_version.sh
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#!/bin/bash
ROOT="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"/..
OLDVER=m91-71fcb16fc2
NEWVER=m91-1a01201b77
OLDVER=m91-1a01201b77
NEWVER=m92-81ce29695f
find -E $ROOT/script *.md .github -regex '.*\.(py|md|yml)' -exec sed -i '' -e "s/$OLDVER/$NEWVER/g" {} \;

0 comments on commit 57e7904

Please sign in to comment.