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/2d/ScaledFontMac.cpp | |
| 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/2d/ScaledFontMac.cpp')
| -rw-r--r-- | gfx/2d/ScaledFontMac.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/gfx/2d/ScaledFontMac.cpp b/gfx/2d/ScaledFontMac.cpp index 9528b3527e..7ac1cfc9c9 100644 --- a/gfx/2d/ScaledFontMac.cpp +++ b/gfx/2d/ScaledFontMac.cpp @@ -7,7 +7,9 @@ #include "ScaledFontMac.h" #include "UnscaledFontMac.h" #include "mozilla/webrender/WebRenderTypes.h" -#include "nsCocoaFeatures.h" +#ifdef MOZ_WIDGET_COCOA +# include "nsCocoaFeatures.h" +#endif #include "PathSkia.h" #include "skia/include/core/SkPaint.h" #include "skia/include/core/SkPath.h" @@ -73,6 +75,7 @@ class AutoRelease final { CTFontRef CreateCTFontFromCGFontWithVariations(CGFontRef aCGFont, CGFloat aSize, bool aInstalledFont, CTFontDescriptorRef aFontDesc) { +#ifdef MOZ_WIDGET_COCOA // New implementation (see bug 1856035) for macOS 13+. if (nsCocoaFeatures::OnVenturaOrLater()) { // Create CTFont, applying any descriptor that was passed (used by @@ -96,6 +99,7 @@ CTFontRef CreateCTFontFromCGFontWithVariations(CGFontRef aCGFont, CGFloat aSize, // No variations to set, just return the default CTFont. return ctFont.forget(); } +#endif // Older implementation used up to macOS 12. CTFontRef ctFont; |