aboutsummaryrefslogtreecommitdiff
path: root/www/seamonkey2/files/patch-gfx_src_gtk_nsFontMetricsXft.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'www/seamonkey2/files/patch-gfx_src_gtk_nsFontMetricsXft.cpp')
-rw-r--r--www/seamonkey2/files/patch-gfx_src_gtk_nsFontMetricsXft.cpp55
1 files changed, 0 insertions, 55 deletions
diff --git a/www/seamonkey2/files/patch-gfx_src_gtk_nsFontMetricsXft.cpp b/www/seamonkey2/files/patch-gfx_src_gtk_nsFontMetricsXft.cpp
deleted file mode 100644
index 0071f169c0e2..000000000000
--- a/www/seamonkey2/files/patch-gfx_src_gtk_nsFontMetricsXft.cpp
+++ /dev/null
@@ -1,55 +0,0 @@
---- gfx/src/gtk/nsFontMetricsXft.cpp.orig Tue Mar 25 16:13:01 2003
-+++ gfx/src/gtk/nsFontMetricsXft.cpp Mon Apr 14 10:21:18 2003
-@@ -90,6 +90,7 @@
- FcPattern *mPattern;
- FcPattern *mFontName;
- FcCharSet *mCharset;
-+ int mNotXft;
- };
-
- struct MozXftLangGroup {
-@@ -772,7 +773,7 @@
- // font in our loaded list that supports the character
- for (PRInt32 i = 0, end = mLoadedFonts.Count(); i < end; ++i) {
- nsFontXft *font = (nsFontXft *)mLoadedFonts.ElementAt(i);
-- if (FcCharSetHasChar(font->mCharset, aChar))
-+ if (FcCharSetHasChar(font->mCharset, aChar) && font->GetXftFont())
- return font;
- }
-
-@@ -1194,7 +1195,7 @@
- for (PRInt32 j = 0, end = mLoadedFonts.Count(); j < end; ++j) {
- nsFontXft *font;
- font = (nsFontXft *)mLoadedFonts.ElementAt(j);
-- if (FcCharSetHasChar(font->mCharset, c)) {
-+ if (FcCharSetHasChar(font->mCharset, c) && font->GetXftFont()) {
- foundFont = font;
- break;
- }
-@@ -1503,6 +1504,7 @@
- FcPatternReference(mFontName);
-
- mXftFont = nsnull;
-+ mNotXft = 0;
-
- // set up our charset
- mCharset = nsnull;
-@@ -1529,14 +1531,16 @@
- XftFont *
- nsFontXft::GetXftFont(void)
- {
-- if (!mXftFont) {
-+ if (!mXftFont && !mNotXft) {
- FcPattern *pat = FcFontRenderPrepare(0, mPattern, mFontName);
- if (!pat)
- return nsnull;
-
- mXftFont = XftFontOpenPattern(GDK_DISPLAY(), pat);
-- if (!mXftFont)
-+ if (!mXftFont) {
- FcPatternDestroy(pat);
-+ mNotXft = 1;
-+ }
- }
-
- return mXftFont;