From 40a355a42d4a9444dc753c04c6608dade2f06a23 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Fri, 19 Apr 2024 03:13:27 +0200 Subject: Adding upstream version 125.0.1. Signed-off-by: Daniel Baumann --- gfx/skia/skia/src/ports/SkTypeface_mac_ct.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gfx/skia') diff --git a/gfx/skia/skia/src/ports/SkTypeface_mac_ct.cpp b/gfx/skia/skia/src/ports/SkTypeface_mac_ct.cpp index 362245ec45..ebeda314d8 100644 --- a/gfx/skia/skia/src/ports/SkTypeface_mac_ct.cpp +++ b/gfx/skia/skia/src/ports/SkTypeface_mac_ct.cpp @@ -64,7 +64,7 @@ #include #include -#ifdef MOZ_SKIA +#if defined(MOZ_SKIA) && defined(XP_MACOSX) #include "nsCocoaFeatures.h" #endif @@ -290,7 +290,7 @@ SkUniqueCFRef SkCTFontCreateExactCopy(CTFontRef baseFont, CGFloat tex auto ctFont = SkUniqueCFRef( CTFontCreateWithGraphicsFont(baseCGFont.get(), textSize, nullptr, desc.get())); if (variations) { -#ifdef MOZ_SKIA +#if defined(MOZ_SKIA) && defined(XP_MACOSX) if (nsCocoaFeatures::OnVenturaOrLater()) { // On recent macOS versions, CTFontCreateWithGraphicsFont fails to apply // the variations from the descriptor, so to get the correct values we use -- cgit v1.2.3