From be1b3e06168fbf3fdbc9080ba33be9ce8f59d864 Mon Sep 17 00:00:00 2001
From: Karl Tomlinson <karlt+@karlt.net>
Date: Thu, 11 Nov 2010 08:44:32 +1300
Subject: [PATCH] b=597212 hold a reference to language nsIAtom from
 gfxFontStyle r=jfkthame a=joe

--HG--
extra : transplant_source : %11e%10%CF%5E%90Ce%84S%ADj%16%EC%8FA%9A%0A%D5%29
---
 gfx/thebes/gfxFont.h         | 2 +-
 gfx/thebes/gfxPangoFonts.cpp | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/gfx/thebes/gfxFont.h b/gfx/thebes/gfxFont.h
index ebad100e4b4..3b9fd312169 100644
--- a/gfx/thebes/gfxFont.h
+++ b/gfx/thebes/gfxFont.h
@@ -156,7 +156,7 @@ struct THEBES_API gfxFontStyle {
     // the language (may be an internal langGroup code rather than an actual
     // language code) specified in the document or element's lang property,
     // or inferred from the charset
-    nsIAtom *language;
+    nsRefPtr<nsIAtom> language;
 
     // Language system tag, to override document language;
     // an OpenType "language system" tag represented as a 32-bit integer
diff --git a/gfx/thebes/gfxPangoFonts.cpp b/gfx/thebes/gfxPangoFonts.cpp
index 55b2f179349..cb46d0b4dcc 100644
--- a/gfx/thebes/gfxPangoFonts.cpp
+++ b/gfx/thebes/gfxPangoFonts.cpp
@@ -2031,7 +2031,7 @@ gfxPangoFontGroup::MakeFontSet(PangoLanguage *aLang, gfxFloat aSizeAdjustFactor,
     }
 
     nsAutoTArray<nsString, 20> fcFamilyList;
-    GetFcFamilies(&fcFamilyList, langGroup ? langGroup : mStyle.language);
+    GetFcFamilies(&fcFamilyList, langGroup ? langGroup : mStyle.language.get());
 
     // To consider: A fontset cache here could be helpful.