600102 - Add ability to build with --disable-pango

Status: RESOLVED FIXED

(Core :: Layout: Text and Fonts, defect)

Description

[Stuart Parmenter]

Attachment: fix

Right now things are broken due to code bitrotting

Comment 1

[Karl Tomlinson (:karlt)]

Comment on attachment 478942 [details] [diff] [review]
fix

>diff --git a/gfx/thebes/gfxPlatformGtk.cpp b/gfx/thebes/gfxPlatformGtk.cpp
>--- a/gfx/thebes/gfxPlatformGtk.cpp
>+++ b/gfx/thebes/gfxPlatformGtk.cpp
>@@ -95,7 +95,7 @@
> 
> #ifndef MOZ_PANGO
> typedef nsDataHashtable<nsStringHashKey, nsRefPtr<FontFamily> > FontTable;
>-typedef nsDataHashtable<nsCStringHashKey, nsTArray<nsRefPtr<FontEntry> > > PrefFontTable;
>+typedef nsDataHashtable<nsCStringHashKey, nsTArray<nsRefPtr<gfxFontEntry> > > PrefFontTable;
> static FontTable *gPlatformFonts = NULL;
> static FontTable *gPlatformFontAliases = NULL;
> static PrefFontTable *gPrefFonts = NULL;
>@@ -306,7 +306,7 @@
> #else
> 
> nsresult
>-gfxPlatformGtk::GetFontList(const nsACString& aLangGroup,
>+gfxPlatformGtk::GetFontList(nsIAtom *aLangGroup,
>                             const nsACString& aGenericFamily,
>                             nsTArray<nsString>& aListOfFonts)
> {
>@@ -477,10 +477,10 @@
> 
> gfxFontGroup *
> gfxPlatformGtk::CreateFontGroup(const nsAString &aFamilies,
>-                               const gfxFontStyle *aStyle,
>-                                gfxUserFontSet * /*aUserFontSet*/)
>+                                const gfxFontStyle *aStyle,
>+                                gfxUserFontSet *aUserFontSet)
> {
>-    return new gfxFT2FontGroup(aFamilies, aStyle);
>+    return new gfxFT2FontGroup(aFamilies, aStyle, aUserFontSet);
> }
> 
> #endif
>@@ -698,13 +698,13 @@
> }
> 
> PRBool
>-gfxPlatformGtk::GetPrefFontEntries(const nsCString& aKey, nsTArray<nsRefPtr<FontEntry> > *aFontEntryList)
>+gfxPlatformGtk::GetPrefFontEntries(const nsCString& aKey, nsTArray<nsRefPtr<gfxFontEntry> > *aFontEntryList)
> {
>     return gPrefFonts->Get(aKey, aFontEntryList);
> }
> 
> void
>-gfxPlatformGtk::SetPrefFontEntries(const nsCString& aKey, nsTArray<nsRefPtr<FontEntry> >& aFontEntryList)
>+gfxPlatformGtk::SetPrefFontEntries(const nsCString& aKey, nsTArray<nsRefPtr<gfxFontEntry> >& aFontEntryList)
> {
>     gPrefFonts->Put(aKey, aFontEntryList);
> }
>diff --git a/gfx/thebes/gfxPlatformGtk.h b/gfx/thebes/gfxPlatformGtk.h
>--- a/gfx/thebes/gfxPlatformGtk.h
>+++ b/gfx/thebes/gfxPlatformGtk.h
>@@ -110,8 +110,8 @@
>     FontFamily *FindFontFamily(const nsAString& aName);
>     FontEntry *FindFontEntry(const nsAString& aFamilyName, const gfxFontStyle& aFontStyle);
>     already_AddRefed<gfxFont> FindFontForChar(PRUint32 aCh, gfxFont *aFont);
>-    PRBool GetPrefFontEntries(const nsCString& aLangGroup, nsTArray<nsRefPtr<FontEntry> > *aFontEntryList);
>-    void SetPrefFontEntries(const nsCString& aLangGroup, nsTArray<nsRefPtr<FontEntry> >& aFontEntryList);
>+    PRBool GetPrefFontEntries(const nsCString& aLangGroup, nsTArray<nsRefPtr<gfxFontEntry> > *aFontEntryList);
>+    void SetPrefFontEntries(const nsCString& aLangGroup, nsTArray<nsRefPtr<gfxFontEntry> >& aFontEntryList);
> #endif
> 
> #ifndef MOZ_PANGO

Comment 2

[Doug Turner (:dougt)]

karl, can we push this?

Comment 3

[Karl Tomlinson (:karlt)]

Yes, fine by me.  (Sorry about the edit-as-comment spam.)

Comment 4

[Brian Crowder]

Assigning ownership to stuart just so it's easier to search for unowned blockers.

Comment 5

[Doug Turner (:dougt)]

http://hg.mozilla.org/mozilla-central/rev/f44e3c04264c