From a095661e86403b71a179d2a29a665faa21cdaed1 Mon Sep 17 00:00:00 2001 From: Jazzzny Date: Wed, 8 Jul 2026 13:43:07 -0400 Subject: [PATCH] Use Skia macros where appropriate --- gfx/2d/ScaledFontMac.cpp | 2 +- gfx/2d/ScaledFontMac.h | 2 +- widget/cocoa/nsChildView.mm | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/gfx/2d/ScaledFontMac.cpp b/gfx/2d/ScaledFontMac.cpp index 4243dc5299..3f99d41d37 100644 --- a/gfx/2d/ScaledFontMac.cpp +++ b/gfx/2d/ScaledFontMac.cpp @@ -115,7 +115,7 @@ ScaledFontMac::GetPathForGlyphs(const GlyphBuffer &aBuffer, const DrawTarget *aT return ScaledFontBase::GetPathForGlyphs(aBuffer, aTarget); } -#if !defined(MAC_OS_X_VERSION_10_7) || (MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_7) +#ifndef USE_SKIA void ScaledFontMac::CopyGlyphsToBuilder(const GlyphBuffer &aBuffer, PathBuilder *aBuilder, const Matrix *aTransformHint) { diff --git a/gfx/2d/ScaledFontMac.h b/gfx/2d/ScaledFontMac.h index e30249ca19..5524d70e3f 100644 --- a/gfx/2d/ScaledFontMac.h +++ b/gfx/2d/ScaledFontMac.h @@ -32,7 +32,7 @@ public: virtual SkTypeface* GetSkTypeface(); #endif virtual already_AddRefed GetPathForGlyphs(const GlyphBuffer &aBuffer, const DrawTarget *aTarget); -#if !defined(MAC_OS_X_VERSION_10_7) || (MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_7) +#ifndef USE_SKIA virtual void CopyGlyphsToBuilder(const GlyphBuffer &aBuffer, PathBuilder *aBuilder, const Matrix *aTransformHint); #endif virtual bool GetFontFileData(FontFileDataOutput aDataCallback, void *aBaton); diff --git a/widget/cocoa/nsChildView.mm b/widget/cocoa/nsChildView.mm index 783da671ed..bc81aa2558 100644 --- a/widget/cocoa/nsChildView.mm +++ b/widget/cocoa/nsChildView.mm @@ -3727,7 +3727,7 @@ NSEvent* gLastDragMouseDownEvent = nil; NSSize viewSize = [self bounds].size; gfx::IntSize backingSize = gfx::IntSize::Truncate(viewSize.width * scale, viewSize.height * scale); -#if defined(MAC_OS_X_VERSION_10_7) && (MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_7) +#ifdef USE_SKIA LayoutDeviceIntRegion region = [self nativeDirtyRegionWithBoundingRect:aRect]; bool painted = mGeckoChild->PaintWindowInContext(cgContext, region, backingSize);