Merging upstream version 125.0.1.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 3 insertions, 8 deletions

diff --git a/gfx/thebes/gfxMacPlatformFontList.h b/gfx/thebes/gfxMacPlatformFontList.h
index ac0d8927fe..8bafa1b803 100644
--- a/gfx/thebes/gfxMacPlatformFontList.h
+++ b/gfx/thebes/gfxMacPlatformFontList.h
@@ -17,6 +17,9 @@ class gfxMacPlatformFontList final : public CoreTextFontList {
         gfxPlatformFontList::PlatformFontList());
   }
 
+  nsTArray<std::pair<const char**, uint32_t>> GetFilteredPlatformFontLists()
+      override;
+
   static void LookupSystemFont(mozilla::LookAndFeel::FontID aSystemFontID,
                                nsACString& aSystemFontName,
                                gfxFontStyle& aFontStyle);
@@ -25,11 +28,6 @@ class gfxMacPlatformFontList final : public CoreTextFontList {
   bool DeprecatedFamilyIsAvailable(const nsACString& aName) override;
   FontVisibility GetVisibilityForFamily(const nsACString& aName) const override;
 
-  FontFamily GetDefaultFontForPlatform(nsPresContext* aPresContext,
-                                       const gfxFontStyle* aStyle,
-                                       nsAtom* aLanguage = nullptr)
-      MOZ_REQUIRES(mLock) override;
-
  private:
   friend class gfxPlatformMac;
 
@@ -40,9 +38,6 @@ class gfxMacPlatformFontList final : public CoreTextFontList {
   void InitSingleFaceList() MOZ_REQUIRES(mLock) override;
   void InitAliasesForSingleFaceList() MOZ_REQUIRES(mLock) override;
 
-  // initialize system fonts
-  void InitSystemFontNames() override MOZ_REQUIRES(mLock);
-
   nsTArray<nsCString> mSingleFaceFonts;
 };