diff --git a/README.md b/README.md index 3dfd13a..bc37e66 100644 --- a/README.md +++ b/README.md @@ -13,7 +13,7 @@ Update `version` in [.github/workflows/build.yml](https://github.com/JetBrains/s ## Building locally ```sh -python3 script/checkout.py --version m92-a77a4620d2 +python3 script/checkout.py --version m93-87e8842e8c python3 script/build.py python3 script/archive.py ``` @@ -21,7 +21,7 @@ python3 script/archive.py To build a debug build: ```sh -python3 script/checkout.py --version m92-a77a4620d2 +python3 script/checkout.py --version m93-87e8842e8c python3 script/build.py --build-type Debug python3 script/archive.py --build-type Debug ``` diff --git a/patches/OneLineShaper.patch b/patches/OneLineShaper.patch deleted file mode 100644 index 600b61c..0000000 --- a/patches/OneLineShaper.patch +++ /dev/null @@ -1,32 +0,0 @@ -diff --git a/modules/skparagraph/src/OneLineShaper.cpp b/modules/skparagraph/src/OneLineShaper.cpp -index b6a91c5..0b13f93 100644 ---- a/modules/skparagraph/src/OneLineShaper.cpp -+++ b/modules/skparagraph/src/OneLineShaper.cpp -@@ -487,6 +487,7 @@ - if (fParagraph->fFontCollection->fontFallbackEnabled()) { - // Give fallback a clue - // Some unresolved subblocks might be resolved with different fallback fonts -+ std::vector hopelessBlocks; - while (!fUnresolvedBlocks.empty()) { - auto unresolvedRange = fUnresolvedBlocks.front().fText; - auto unresolvedText = fParagraph->text(unresolvedRange); -@@ -527,6 +528,8 @@ - - if (ch == unresolvedText.end()) { - // Not a single codepoint could be resolved but we finished the block -+ hopelessBlocks.push_back(fUnresolvedBlocks.front()); -+ fUnresolvedBlocks.pop_front(); - break; - } - -@@ -540,7 +543,10 @@ - } - } - } -+ } - -+ for (auto& block : hopelessBlocks) { -+ fUnresolvedBlocks.emplace_front(block); - } - } - } diff --git a/patches/SkSVGDOM.h.patch b/patches/SkSVGDOM.h.patch deleted file mode 100644 index 488f346..0000000 --- a/patches/SkSVGDOM.h.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); diff --git a/script/update_version.sh b/script/update_version.sh index 3e1f627..2dea028 100755 --- a/script/update_version.sh +++ b/script/update_version.sh @@ -1,5 +1,5 @@ #!/bin/bash ROOT="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"/.. -OLDVER=m92-81ce29695f -NEWVER=m92-a77a4620d2 +OLDVER=m92-a77a4620d2 +NEWVER=m93-87e8842e8c find -E $ROOT/script *.md .github -regex '.*\.(py|md|yml)' -exec sed -i '' -e "s/$OLDVER/$NEWVER/g" {} \;