external/skia/UnpackedTarball_skia.mk | 1 external/skia/fix-windows-dwrite.patch.1 | 38 ------------------------------- 2 files changed, 39 deletions(-)
New commits: commit c8386d5429f760d18d30fe1464a79e04197754a5 Author: Xisco Fauli <[email protected]> AuthorDate: Fri Feb 20 10:16:32 2026 +0100 Commit: Xisco Fauli <[email protected]> CommitDate: Fri Feb 20 12:28:03 2026 +0100 skia: drop unneeded patch Before commit b8d47321e4eebbdcd687bffdfd8129fbb2969001 Author: Xisco Fauli <[email protected]> Date: Thu Feb 19 23:23:53 2026 +0100 skia: remove old patch NTDDI_VERSION was hardcoded to 0x0A000002 Our current baseline is already greater than NTDDI_WIN10_RS3 so no need to use these conditions anymore Change-Id: I19970e643eb3828447fa52925edee2f71de26747 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/199800 Reviewed-by: Xisco Fauli <[email protected]> Tested-by: Jenkins diff --git a/external/skia/UnpackedTarball_skia.mk b/external/skia/UnpackedTarball_skia.mk index 29d88d399123..6dbeaf9cbfee 100644 --- a/external/skia/UnpackedTarball_skia.mk +++ b/external/skia/UnpackedTarball_skia.mk @@ -24,7 +24,6 @@ skia_patches := \ fix-without-gl.patch.1 \ windows-typeface-directwrite.patch.1 \ windows-raster-surface-no-copies.patch.1 \ - fix-windows-dwrite.patch.1 \ swap-buffers-rect.patch.1 \ ubsan.patch.1 \ fix-warnings.patch.1 \ diff --git a/external/skia/fix-windows-dwrite.patch.1 b/external/skia/fix-windows-dwrite.patch.1 deleted file mode 100644 index 651740efda19..000000000000 --- a/external/skia/fix-windows-dwrite.patch.1 +++ /dev/null @@ -1,38 +0,0 @@ -diff --git a/src/ports/SkFontMgr_win_dw.cpp b/src/ports/SkFontMgr_win_dw.cpp -index 6a4748f91c..50086a7780 100644 ---- a/src/ports/SkFontMgr_win_dw.cpp -+++ b/src/ports/SkFontMgr_win_dw.cpp -@@ -361,6 +361,7 @@ static bool FindByDWriteFont(SkTypeface* cached, void* ctx) { - DWriteFontTypeface* cshFace = reinterpret_cast<DWriteFontTypeface*>(cached); - ProtoDWriteTypeface* ctxFace = reinterpret_cast<ProtoDWriteTypeface*>(ctx); - -+#if defined(NTDDI_WIN10_RS3) && NTDDI_VERSION >= NTDDI_WIN10_RS3 - // IDWriteFontFace5 introduced both Equals and HasVariations - SkTScopedComPtr<IDWriteFontFace5> cshFontFace5; - SkTScopedComPtr<IDWriteFontFace5> ctxFontFace5; -@@ -369,6 +370,7 @@ static bool FindByDWriteFont(SkTypeface* cached, void* ctx) { - if (cshFontFace5 && ctxFontFace5) { - return cshFontFace5->Equals(ctxFontFace5.get()); - } -+#endif - - bool same; - -diff --git a/src/ports/SkScalerContext_win_dw.cpp b/src/ports/SkScalerContext_win_dw.cpp -index b2df467b22..385094e506 100644 ---- a/src/ports/SkScalerContext_win_dw.cpp -+++ b/src/ports/SkScalerContext_win_dw.cpp -@@ -1883,11 +1883,13 @@ - metrics->fFlags |= SkFontMetrics::kStrikeoutThicknessIsValid_Flag; - metrics->fFlags |= SkFontMetrics::kStrikeoutPositionIsValid_Flag; - -+#if defined(NTDDI_WIN10_RS3) && NTDDI_VERSION >= NTDDI_WIN10_RS3 - IDWriteFontFace5* fontFace5 = this->getDWriteTypeface()->fDWriteFontFace5.get(); - if (fontFace5 && fontFace5->HasVariations()) { - // The bounds are only valid for the default variation. - metrics->fFlags |= SkFontMetrics::kBoundsInvalid_Flag; - } -+#endif - - IDWriteFontFace1* fontFace1 = this->getDWriteTypeface()->fDWriteFontFace1.get(); - if (fontFace1) {
