diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-19 01:13:27 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-19 01:13:27 +0000 |
| commit | 40a355a42d4a9444dc753c04c6608dade2f06a23 (patch) | |
| tree | 871fc667d2de662f171103ce5ec067014ef85e61 /gfx/skia | |
| parent | Adding upstream version 124.0.1. (diff) | |
| download | firefox-40a355a42d4a9444dc753c04c6608dade2f06a23.tar.xz firefox-40a355a42d4a9444dc753c04c6608dade2f06a23.zip | |
Adding upstream version 125.0.1.upstream/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 |