summaryrefslogtreecommitdiffstats
path: root/www/mozilla/files/extra-patch-nsSVGLibartGlyphMetricsFT.cpp
diff options
context:
space:
mode:
authormarcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059>2007-03-19 13:35:06 +0800
committermarcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059>2007-03-19 13:35:06 +0800
commit716e853082f85512d878931d3c2903f4a669c7e8 (patch)
tree3a24d58f313f014bb8f3aca107a85ec50d2fb1df /www/mozilla/files/extra-patch-nsSVGLibartGlyphMetricsFT.cpp
parentea6bb0f0996a0cf559b13cfa9aef24e8199d6a23 (diff)
downloadmarcuscom-ports-716e853082f85512d878931d3c2903f4a669c7e8.tar
marcuscom-ports-716e853082f85512d878931d3c2903f4a669c7e8.tar.gz
marcuscom-ports-716e853082f85512d878931d3c2903f4a669c7e8.tar.bz2
marcuscom-ports-716e853082f85512d878931d3c2903f4a669c7e8.tar.lz
marcuscom-ports-716e853082f85512d878931d3c2903f4a669c7e8.tar.xz
marcuscom-ports-716e853082f85512d878931d3c2903f4a669c7e8.tar.zst
marcuscom-ports-716e853082f85512d878931d3c2903f4a669c7e8.zip
Remove these ports now that they have been committed to FreeBSD.
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@8576 df743ca5-7f9a-e211-a948-0013205c9059
Diffstat (limited to 'www/mozilla/files/extra-patch-nsSVGLibartGlyphMetricsFT.cpp')
-rw-r--r--www/mozilla/files/extra-patch-nsSVGLibartGlyphMetricsFT.cpp88
1 files changed, 0 insertions, 88 deletions
diff --git a/www/mozilla/files/extra-patch-nsSVGLibartGlyphMetricsFT.cpp b/www/mozilla/files/extra-patch-nsSVGLibartGlyphMetricsFT.cpp
deleted file mode 100644
index 758c0146c..000000000
--- a/www/mozilla/files/extra-patch-nsSVGLibartGlyphMetricsFT.cpp
+++ /dev/null
@@ -1,88 +0,0 @@
---- layout/svg/renderer/src/libart/nsSVGLibartGlyphMetricsFT.cpp.orig Wed Mar 2 12:36:59 2005
-+++ layout/svg/renderer/src/libart/nsSVGLibartGlyphMetricsFT.cpp Wed Mar 2 12:36:37 2005
-@@ -56,6 +56,13 @@
- #include "nsArray.h"
- #include "nsDataHashtable.h"
-
-+
-+#ifdef HAVE_CPP_2BYTE_WCHAR_T
-+ typedef nsDependentString nsLiteralString;
-+#else
-+ typedef NS_ConvertASCIItoUTF16 nsLiteralString;
-+#endif
-+
- /**
- * \addtogroup libart_renderer Libart Rendering Engine
- * @{
-@@ -112,7 +119,7 @@
- nsCOMPtr<nsISVGGlyphMetricsSource> mSource;
-
- public:
-- static nsDataHashtable<nsStringHashKey,nsDependentString*> sFontAliases;
-+ static nsDataHashtable<nsStringHashKey,nsLiteralString*> sFontAliases;
- };
-
- /** @} */
-@@ -120,7 +127,7 @@
- //----------------------------------------------------------------------
- // nsSVGLibartGlyphMetricsFT implementation:
-
--nsDataHashtable<nsStringHashKey,nsDependentString*>
-+nsDataHashtable<nsStringHashKey,nsLiteralString*>
- nsSVGLibartGlyphMetricsFT::sFontAliases;
-
-
-@@ -155,15 +162,15 @@
-
- static NS_NAMED_LITERAL_STRING(arial, "arial");
- nsSVGLibartGlyphMetricsFT::sFontAliases.Put(NS_LITERAL_STRING("helvetica"),
-- &arial);
-+ (nsLiteralString *)&arial);
-
- static NS_NAMED_LITERAL_STRING(courier, "courier new");
- nsSVGLibartGlyphMetricsFT::sFontAliases.Put(NS_LITERAL_STRING("courier"),
-- &courier);
-+ (nsLiteralString *)&courier);
-
- static NS_NAMED_LITERAL_STRING(times, "times new roman");
- nsSVGLibartGlyphMetricsFT::sFontAliases.Put(NS_LITERAL_STRING("times"),
-- &times);
-+ (nsLiteralString *)&times);
- }
-
- void NS_FreeSVGLibartGlyphMetricsFTGlobals()
-@@ -406,7 +413,7 @@
- }
- else {
- // try alias if there is one:
-- nsDependentString *alias = nsnull;
-+ nsLiteralString *alias = nsnull;
- nsSVGLibartGlyphMetricsFT::sFontAliases.Get(NS_ConvertUTF8toUCS2(family_name),
- &alias);
- if (alias) {
-@@ -440,19 +447,19 @@
- return;
- }
-
-- FTC_Image_Desc imageDesc;
-- imageDesc.font.face_id=(void*)font_data.font_entry.get(); // XXX do we need to addref?
-+ FTC_ImageType imageDesc;
-+ imageDesc->face_id = (FTC_FaceID)font_data.font_entry.get(); // XXX do we need to addref?
- float twipstopixel = GetTwipsToPixels();
- float scale = GetPixelScale();
-- imageDesc.font.pix_width = (int)((float)(font_data.font.size)*twipstopixel/scale);
-- imageDesc.font.pix_height = (int)((float)(font_data.font.size)*twipstopixel/scale);
-- imageDesc.image_type |= ftc_image_grays;
-+ imageDesc->width = (int)((float)(font_data.font.size)*twipstopixel/scale);
-+ imageDesc->height = (int)((float)(font_data.font.size)*twipstopixel/scale);
-+ imageDesc->flags = 0;
-
- // get the face
- nsresult rv;
- FTC_Manager mgr;
- nsSVGLibartFreetype::ft2->GetFTCacheManager(&mgr);
-- rv = nsSVGLibartFreetype::ft2->ManagerLookupSize(mgr, &imageDesc.font, &mFace, nsnull);
-+ rv = nsSVGLibartFreetype::ft2->ManagerLookupFace(mgr, imageDesc->face_id, &mFace);
- NS_ASSERTION(mFace, "failed to get face/size");
- }
-