Some font updates

gfx/thebes/public/gfxQtFonts.h

@@ -50,10 +50,14 @@
 #define ENABLE_FAST_PATH_8BIT 1
 #define ENABLE_FAST_PATH_ALWAYS 1
 
+class QFont;
+
 class gfxQtFont : public gfxFont {
 public:
      gfxQtFont (const nsAString& aName,
                 const gfxFontStyle *aFontStyle);
+     gfxQtFont(QFont *aQFont, const nsAString &aName,
+               const gfxFontStyle *aFontStyle);
      virtual ~gfxQtFont ();
 
      virtual nsString GetUniqueName ();

gfx/thebes/src/gfxQtFonts.cpp

@@ -47,6 +47,7 @@
 #include "gfxQtFonts.h"
 #include "qdebug.h"
 #include "qrect.h"
+#include <QFont>
 #include <locale.h>
 #include <cairo.h>
 #include <QFontMetrics>
@@ -472,6 +473,16 @@ gfxQtFont::gfxQtFont(const nsAString &aName,
 {
 }
 
+gfxQtFont::gfxQtFont(QFont *aQFont, const nsAString &aName,
+                     const gfxFontStyle *aFontStyle)
+        : gfxFont(aName, aFontStyle),
+        mQFont(aQFont), mCairoFont(nsnull),
+        mHasMetrics(PR_FALSE), mAdjustedSize(aFontStyle->size)
+{
+//    g_object_ref(mPangoFont);
+//    g_object_set_qdata(G_OBJECT(mPangoFont), GetFontQuark(), this);
+}
+
 gfxQtFont::~gfxQtFont()
 {
 }