35944f86f2
this is smaller than firefox and has special handling for small screens which is useful for machines like the zaurus. unfortunately, it's not there yet, see the TODO. please don't add this to the www Makefile yet.
62 lines
2.2 KiB
Plaintext
62 lines
2.2 KiB
Plaintext
$OpenBSD: patch-gfx_src_ps_nsFontMetricsPS_cpp,v 1.1.1.1 2005/05/25 06:59:10 jolan Exp $
|
|
--- gfx/src/ps/nsFontMetricsPS.cpp.orig Thu Apr 28 03:04:00 2005
|
|
+++ gfx/src/ps/nsFontMetricsPS.cpp Wed May 18 03:14:27 2005
|
|
@@ -1859,10 +1859,10 @@ nsFontPSFreeType::Init(nsITrueTypeFontCa
|
|
|
|
mPixelSize = NSToIntRound(app2dev * mFont->size);
|
|
|
|
- mImageDesc.font.face_id = (void*)mEntry;
|
|
- mImageDesc.font.pix_width = mPixelSize;
|
|
- mImageDesc.font.pix_height = mPixelSize;
|
|
- mImageDesc.image_type = 0;
|
|
+ mImageDesc->face_id = (FTC_FaceID)&mEntry;
|
|
+ mImageDesc->width = mPixelSize;
|
|
+ mImageDesc->height = mPixelSize;
|
|
+ mImageDesc->flags = 0;
|
|
|
|
nsresult rv;
|
|
mFt2 = do_GetService(NS_FREETYPE2_CONTRACTID, &rv);
|
|
@@ -1896,7 +1896,7 @@ nsFontPSFreeType::GetWidth(const PRUnich
|
|
if (!face)
|
|
return 0;
|
|
|
|
- FTC_Image_Cache iCache;
|
|
+ FTC_ImageCache iCache;
|
|
nsresult rv = mFt2->GetImageCache(&iCache);
|
|
if (NS_FAILED(rv)) {
|
|
NS_ERROR("Failed to get Image Cache");
|
|
@@ -1934,8 +1934,8 @@ nsFontPSFreeType::getFTFace()
|
|
|
|
FTC_Manager cManager;
|
|
mFt2->GetFTCacheManager(&cManager);
|
|
- nsresult rv = mFt2->ManagerLookupSize(cManager, &mImageDesc.font,
|
|
- &face, nsnull);
|
|
+ nsresult rv = mFt2->ManagerLookupFace(cManager, mImageDesc->face_id,
|
|
+ &face);
|
|
NS_ASSERTION(rv==0, "failed to get face/size");
|
|
if (rv)
|
|
return nsnull;
|
|
@@ -2379,16 +2379,16 @@ void nsFT2Type1Generator::GeneratePSFont
|
|
mEntry->GetFamilyName(fontName);
|
|
mEntry->GetStyleName(styleName);
|
|
|
|
- mImageDesc.font.face_id = (void*)mEntry;
|
|
+ mImageDesc->face_id = (FTC_FaceID)&mEntry;
|
|
// TT glyph has no relation to size
|
|
- mImageDesc.font.pix_width = 16;
|
|
- mImageDesc.font.pix_height = 16;
|
|
- mImageDesc.image_type = 0;
|
|
+ mImageDesc->width = 16;
|
|
+ mImageDesc->height = 16;
|
|
+ mImageDesc->flags = 0;
|
|
FT_Face face = nsnull;
|
|
FTC_Manager cManager;
|
|
mFt2->GetFTCacheManager(&cManager);
|
|
- nsresult rv = mFt2->ManagerLookupSize(cManager, &mImageDesc.font,
|
|
- &face, nsnull);
|
|
+ nsresult rv = mFt2->ManagerLookupFace(cManager, mImageDesc->face_id,
|
|
+ &face);
|
|
if (NS_FAILED(rv))
|
|
return;
|
|
|