From aaca58bb25882c146ea30cd8a185c01174d84575 Mon Sep 17 00:00:00 2001 From: Mike Hommey Date: Fri, 1 Mar 2024 19:31:43 +0000 Subject: [PATCH] Bug 1882947 - Adjust SkTypeface_mac_ct.cpp after bug 1858347. r=gfx-reviewers,lsalzman Differential Revision: https://phabricator.services.mozilla.com/D203223 --- gfx/skia/skia/src/ports/SkTypeface_mac_ct.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gfx/skia/skia/src/ports/SkTypeface_mac_ct.cpp b/gfx/skia/skia/src/ports/SkTypeface_mac_ct.cpp index 362245ec45c3..ebeda314d806 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