diff options
| author | Joe Marcus Clarke <marcus@FreeBSD.org> | 2004-02-11 07:16:17 +0000 |
|---|---|---|
| committer | Joe Marcus Clarke <marcus@FreeBSD.org> | 2004-02-11 07:16:17 +0000 |
| commit | 6593022e89db95668f762d4db0020b296f786594 (patch) | |
| tree | 5a8d9af95f916aa8c03b8ad1fcec948d0bf7d5e7 /www/firefox35/files/patch-gfx_src_gtk_nsFontMetricsXft.cpp | |
| parent | Update to 1.04: documentation and bugfixes. See Changes for details. (diff) | |
Add Firefox after a repo copy from mozilla-firebird. Firefox is the next
release of the Firebird web browser with a new name to avoid conflicts with
the Firebird database. This is version 0.8.
http://www.mozilla.org/products/firefox/releases/
* Update to 0.8 and change name to firefox [1]
* Make PLIST from a fake installation [1]
* Restore original credit and portname in Makefile [1]
* Optionally install headers and IDL files [2]
* Use PERL instead of REINPLACE_CMD in a few places [1]
* Use OPTIONS
* Enable the Inspector extension
* Fix another possible esound related problem
* Enable basic optimizations if WITH_DEBUG is not specified
PR: 62631 [2]
Submitted by: trevor [1] [2]
Diffstat (limited to 'www/firefox35/files/patch-gfx_src_gtk_nsFontMetricsXft.cpp')
| -rw-r--r-- | www/firefox35/files/patch-gfx_src_gtk_nsFontMetricsXft.cpp | 57 |
1 files changed, 0 insertions, 57 deletions
diff --git a/www/firefox35/files/patch-gfx_src_gtk_nsFontMetricsXft.cpp b/www/firefox35/files/patch-gfx_src_gtk_nsFontMetricsXft.cpp deleted file mode 100644 index 0b0e08247101..000000000000 --- a/www/firefox35/files/patch-gfx_src_gtk_nsFontMetricsXft.cpp +++ /dev/null @@ -1,57 +0,0 @@ ---- gfx/src/gtk/nsFontMetricsXft.cpp.save Thu Aug 7 12:14:49 2003 -+++ gfx/src/gtk/nsFontMetricsXft.cpp Thu Aug 7 12:33:45 2003 -@@ -106,6 +106,7 @@ - FcPattern *mPattern; - FcPattern *mFontName; - FcCharSet *mCharset; -+ int mNotXft; - }; - - class nsFontXftInfo; -@@ -1051,7 +1052,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 (font->HasChar(PRUint32(aChar))) -+ if (font->HasChar(PRUint32(aChar)) && font->GetXftFont()) - return font; - } - -@@ -1492,7 +1493,7 @@ - // this character. - for (PRInt32 j = 0, end = mLoadedFonts.Count(); j < end; ++j) { - font = (nsFontXft *)mLoadedFonts.ElementAt(j); -- if (font->HasChar(c)) { -+ if (font->HasChar(c) && font->GetXftFont()) { - currFont = font; - goto FoundFont; // for speed -- avoid "if" statement - } -@@ -1922,6 +1923,7 @@ - FcPatternReference(mFontName); - - mXftFont = nsnull; -+ mNotXft = 0; - - // set up our charset - mCharset = nsnull; -@@ -1948,7 +1950,7 @@ - XftFont * - nsFontXft::GetXftFont(void) - { -- if (!mXftFont) { -+ if (!mXftFont && !mNotXft) { - FcPattern *pat = FcFontRenderPrepare(0, mPattern, mFontName); - if (!pat) - return nsnull; -@@ -1967,8 +1969,10 @@ - FcPatternDel(pat, FC_SPACING); - - mXftFont = XftFontOpenPattern(GDK_DISPLAY(), pat); -- if (!mXftFont) -+ if (!mXftFont) { - FcPatternDestroy(pat); -+ mNotXft = 1; -+ } - } - - return mXftFont; |
