diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-19 01:14:29 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-19 01:14:29 +0000 |
| commit | fbaf0bb26397aa498eb9156f06d5a6fe34dd7dd8 (patch) | |
| tree | 4c1ccaf5486d4f2009f9a338a98a83e886e29c97 /gfx/skia | |
| parent | Releasing progress-linux version 124.0.1-1~progress7.99u1. (diff) | |
| download | firefox-fbaf0bb26397aa498eb9156f06d5a6fe34dd7dd8.tar.xz firefox-fbaf0bb26397aa498eb9156f06d5a6fe34dd7dd8.zip | |
Merging upstream version 125.0.1.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'gfx/skia')
| -rw-r--r-- | gfx/skia/skia/src/ports/SkTypeface_mac_ct.cpp | 4 |
1 files 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 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 <string.h> #include <memory> -#ifdef MOZ_SKIA +#if defined(MOZ_SKIA) && defined(XP_MACOSX) #include "nsCocoaFeatures.h" #endif @@ -290,7 +290,7 @@ SkUniqueCFRef<CTFontRef> SkCTFontCreateExactCopy(CTFontRef baseFont, CGFloat tex auto ctFont = SkUniqueCFRef<CTFontRef>( 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 |