diff options
| author | Moonchild <moonchild@palemoon.org> | 2021-05-02 07:10:18 +0000 |
|---|---|---|
| committer | Moonchild <moonchild@palemoon.org> | 2021-05-02 07:10:18 +0000 |
| commit | 3d671e4275c73a1484c72713304c6e04ec4ffc7c (patch) | |
| tree | 98c4e605f3ce273f65fdf208275c433ee4566d4c /gfx/2d | |
| parent | 56da7e27477d0d4669980d2ce17f3b877ea0c36c (diff) | |
| download | uxp-3d671e4275c73a1484c72713304c6e04ec4ffc7c.tar.gz | |
Issue #1751 -- Remove XP_DARWIN
Diffstat (limited to 'gfx/2d')
| -rw-r--r-- | gfx/2d/2D.h | 5 | ||||
| -rw-r--r-- | gfx/2d/Factory.cpp | 21 |
2 files changed, 0 insertions, 26 deletions
diff --git a/gfx/2d/2D.h b/gfx/2d/2D.h index e2020dc9e6..89de5630c6 100644 --- a/gfx/2d/2D.h +++ b/gfx/2d/2D.h @@ -1481,11 +1481,6 @@ public: static already_AddRefed<DrawTarget> CreateDrawTargetWithSkCanvas(SkCanvas* aCanvas); #endif -#ifdef XP_DARWIN - static already_AddRefed<GlyphRenderingOptions> - CreateCGGlyphRenderingOptions(const Color &aFontSmoothingBackgroundColor); -#endif - #ifdef WIN32 static already_AddRefed<DrawTarget> CreateDrawTargetForD3D11Texture(ID3D11Texture2D *aTexture, SurfaceFormat aFormat); diff --git a/gfx/2d/Factory.cpp b/gfx/2d/Factory.cpp index 5cd5d14eab..22352b20c6 100644 --- a/gfx/2d/Factory.cpp +++ b/gfx/2d/Factory.cpp @@ -25,11 +25,6 @@ #include "NativeFontResourceGDI.h" #endif -#ifdef XP_DARWIN -#include "ScaledFontMac.h" -#include "NativeFontResourceMac.h" -#endif - #ifdef MOZ_WIDGET_GTK #include "ScaledFontFontconfig.h" #endif @@ -481,12 +476,6 @@ Factory::CreateScaledFontForNativeFont(const NativeFont &aNativeFont, Float aSiz } #endif #endif -#ifdef XP_DARWIN - case NativeFontType::MAC_FONT_FACE: - { - return MakeAndAddRef<ScaledFontMac>(static_cast<CGFontRef>(aNativeFont.mFont), aSize); - } -#endif #if defined(USE_CAIRO) || defined(USE_SKIA_FREETYPE) case NativeFontType::CAIRO_FONT_FACE: { @@ -524,8 +513,6 @@ Factory::CreateNativeFontResource(uint8_t *aData, uint32_t aSize, return NativeFontResourceGDI::Create(aData, aSize, /* aNeedsCairo = */ true); } -#elif XP_DARWIN - return NativeFontResourceMac::Create(aData, aSize); #else gfxWarning() << "Unable to create cairo scaled font from truetype data"; return nullptr; @@ -802,14 +789,6 @@ Factory::CreateWrappingDataSourceSurface(uint8_t *aData, return newSurf.forget(); } -#ifdef XP_DARWIN -already_AddRefed<GlyphRenderingOptions> -Factory::CreateCGGlyphRenderingOptions(const Color &aFontSmoothingBackgroundColor) -{ - return MakeAndAddRef<GlyphRenderingOptionsCG>(aFontSmoothingBackgroundColor); -} -#endif - already_AddRefed<DataSourceSurface> Factory::CreateDataSourceSurface(const IntSize &aSize, SurfaceFormat aFormat, |