From 0903fed8e45f543865aa2f6051d074475c1d8c20 Mon Sep 17 00:00:00 2001
From: Karl Tomlinson <karlt+@karlt.net>
Date: Thu, 11 Nov 2010 08:45:00 +1300
Subject: [PATCH] b=597212 remove unnecessary extra
 nsILanguageAtomService::LookupLanguage r=jfkthame a=joe

--HG--
extra : transplant_source : p%23%5B%82.%9D70%F6%95%96%85%0C%EE%04%1C%BC9%27%D2
---
 gfx/thebes/gfxPangoFonts.cpp | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

diff --git a/gfx/thebes/gfxPangoFonts.cpp b/gfx/thebes/gfxPangoFonts.cpp
index cb46d0b4dcc7..bfc7430f87ab 100644
--- a/gfx/thebes/gfxPangoFonts.cpp
+++ b/gfx/thebes/gfxPangoFonts.cpp
@@ -50,8 +50,6 @@
 
 #include "nsMathUtils.h"
 #include "nsTArray.h"
-#include "nsServiceManagerUtils.h"
-#include "nsILanguageAtomService.h"
 
 #include "gfxContext.h"
 #ifdef MOZ_WIDGET_GTK2
@@ -2019,19 +2017,15 @@ gfxPangoFontGroup::MakeFontSet(PangoLanguage *aLang, gfxFloat aSizeAdjustFactor,
 {
     const char *lang = pango_language_to_string(aLang);
 
-    nsIAtom *langGroup = nsnull;
+    nsRefPtr <nsIAtom> langGroup;
     if (aLang != mPangoLanguage) {
         // Set up langGroup for Mozilla's font prefs.
-        if (!gLangService) {
-            CallGetService(NS_LANGUAGEATOMSERVICE_CONTRACTID, &gLangService);
-        }
-        if (gLangService) {
-            langGroup = gLangService->LookupLanguage(NS_ConvertUTF8toUTF16(lang));
-        }
+        langGroup = do_GetAtom(lang);
     }
 
     nsAutoTArray<nsString, 20> fcFamilyList;
-    GetFcFamilies(&fcFamilyList, langGroup ? langGroup : mStyle.language.get());
+    GetFcFamilies(&fcFamilyList,
+                  langGroup ? langGroup.get() : mStyle.language.get());
 
     // To consider: A fontset cache here could be helpful.