Remove nsFontList/nsIFontList. b=397813 r+sr+a1.9=pavlov
authordbaron@dbaron.org
Sun, 07 Oct 2007 22:01:49 -0700
changeset 6720 9b70ddf43637c12750836815272bd8845f398c04
parent 6719 ca0920fe88c9813ac777620e045e0e2be605ac78
child 6721 b2024a1516a5e9e7e9da9109b0175e541b8f43b0
push id1
push userroot
push dateTue, 26 Apr 2011 22:38:44 +0000
treeherdermozilla-beta@bfdb6e623a36 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs397813
milestone1.9a9pre
Remove nsFontList/nsIFontList. b=397813 r+sr+a1.9=pavlov
embedding/qa/jstests/ComponentListTest.txt
embedding/qa/jstests/nsIFontListTest.txt
gfx/idl/Makefile.in
gfx/idl/nsIFontList.idl
gfx/public/nsGfxCIID.h
gfx/src/Makefile.in
gfx/src/beos/nsGfxFactoryBeOS.cpp
gfx/src/mac/nsGfxFactoryMac.cpp
gfx/src/nsFontList.cpp
gfx/src/nsFontList.h
gfx/src/photon/nsGfxFactoryPh.cpp
gfx/src/windows/nsGfxFactoryWin.cpp
--- a/embedding/qa/jstests/ComponentListTest.txt
+++ b/embedding/qa/jstests/ComponentListTest.txt
@@ -149,18 +149,17 @@ function getComponentList()
                                  "@mozilla.org/gfx/fontlist;1");
 
   var interfacelist = new Array("nsIURI",
                                 "nsIURL",
                                 "nsISHistory",
                                 "nsIHelperAppLauncherDialog",
                                 "nsILocalFile",
                                 "nsIObserver",
-                                "nsIPrefBranch",
-                                "nsIFontList");
+                                "nsIPrefBranch");
 
   for (var m=0; m<serviceinterfacelist.length; m++)
     checkservice(servicecontractidlist[m], serviceinterfacelist[m]);
 
   for (var n=0; n<interfacelist.length; n++)
     checkinterface(contractidlist[n], interfacelist[n]);
 }
 
@@ -313,9 +312,9 @@ getComponentList();
 getAdditionalComponentList();
 componentres = getComponentResults();
 result = result + componentres;
 result = result + '<br><hr ALIGN=LEFT SIZE=5 NOSHADE WIDTH="80%">' + '\n';
 displayResults(result);
 </script>
 
 </body>
-</html>
\ No newline at end of file
+</html>
deleted file mode 100644
--- a/embedding/qa/jstests/nsIFontListTest.txt
+++ /dev/null
@@ -1,231 +0,0 @@
-<!doctype html public "-//w3c//dtd html 4.0 transitional//en">
-<html>
-<head>
-<title> nsIFontList Interface Test </title>
-<!-- ***** BEGIN LICENSE BLOCK *****
-   - Version: MPL 1.1/GPL 2.0/LGPL 2.1
-   -
-   - The contents of this file are subject to the Mozilla Public License Version
-   - 1.1 (the "License"); you may not use this file except in compliance with
-   - the License. You may obtain a copy of the License at
-   - http://www.mozilla.org/MPL/
-   -
-   - Software distributed under the License is distributed on an "AS IS" basis,
-   - WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-   - for the specific language governing rights and limitations under the
-   - License.
-   -
-   - The Original Code is Mozilla Communicator Test Cases.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications Corporation.
-   - Portions created by the Initial Developer are Copyright (C) 1999
-   - the Initial Developer. All Rights Reserved.
-   -
-   - Contributor(s):
-   -
-   - Alternatively, the contents of this file may be used under the terms of
-   - either the GNU General Public License Version 2 or later (the "GPL"), or
-   - the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-   - in which case the provisions of the GPL or the LGPL are applicable instead
-   - of those above. If you wish to allow use of your version of this file only
-   - under the terms of either the GPL or the LGPL, and not to allow others to
-   - use your version of this file under the terms of the MPL, indicate your
-   - decision by deleting the provisions above and replace them with the notice
-   - and other provisions required by the LGPL or the GPL. If you do not delete
-   - the provisions above, a recipient may use your version of this file under
-   - the terms of any one of the MPL, the GPL or the LGPL.
-   -
-   - ***** END LICENSE BLOCK ***** -->
-<!-- Descrpt: nsIFontList Interface Test Case
-     Author: dsirnapalli@netscape.com
-     Revs: 07.26.01 - Created
-     Last Run On: 10.23.01.-->
-
-<!-- script below is ngdriverspecific  -->
-<script type="text/javascript" src="http://bubblegum/ngdriver/suites/testlib.js">
-</script>
-
-<script type="text/javascript">
-res = "";
-
-function getBrowserVersion()
-{
-
-  res = res + "<font color='#CC6600'> NOTE: </font>" + "<br>";
-  res = res + "For the Test Case to run correctly include the following line into your prefs.js file." + "<br>";
-  res = res + 'user_pref("signed.applets.codebase_principal_support", true);' + "<br>";
-  res = res + 'prefs.js can be found at' + '<br>';
-  res = res + 'WINNT:C:\\WINNT\\Profiles\\profileyouareusing\\Application Data\\MfcEmbed\\Profiles\\default\\somefolder.slt\\prefs.js' + '<br>';
-  res = res + 'WIN98:C:\\WINDOWS\\Application Data\\MfcEmbed\\Profiles\\default\\somefolder.slt\\prefs.js' + '<br>';
-  res = res + '<br><hr ALIGN=LEFT SIZE=5 NOSHADE WIDTH="80%">' + '\n';
-
-  res = res + '<b><h3><font color="#CC6600"> Browser Info </font></h3></b>' + '\n';
-  res = res + '<table BORDER COLS=2 WIDTH="70%">' + '\n';
-  res = res + ' <tr>' + '\n';
-  res = res + '  <td WIDTH="30%"><b> App Name: </b></td>' + '\n';
-  res = res + '  <td>' + navigator.appName + '</td>' + '\n';
-  res = res + ' </tr>' + '\n';
-  res = res + ' <tr>' + '\n';
-  res = res + '  <td><b> User Agent: </b></td>' + '\n';
-  res = res + '  <td>' + navigator.userAgent + '</td>' + '\n';
-  res = res + ' </tr>' + '\n';
-  res = res + ' <tr>' + '\n';
-  res = res + '  <td><b> Code Name: </b></td>' + '\n';
-  res = res + '  <td>' + navigator.appCodeName + '</td>' + '\n';
-  res = res + ' </tr>' + '\n';
-  res = res + ' <tr>' + '\n';
-  res = res + '  <td><b> App Version: </b></td>' + '\n';
-  res = res + '  <td>' + navigator.appVersion + '</td>' + '\n';
-  res = res + ' </tr>' + '\n';
-  res = res + ' <tr>' + '\n';
-  res = res + '  <td><b> Language: </b></td>' + '\n';
-  res = res + '  <td>' + navigator.language + '</td>' + '\n';
-  res = res + ' </tr>' + '\n';
-  res = res + ' <tr>' + '\n';
-  res = res + '  <td><b> Platform: </b></td>' + '\n';
-  res = res + '  <td>' + navigator.platform + '</td>' + '\n';
-  res = res + ' </tr>' + '\n';
-  res = res + '</table>' + '\n';
-  res = res + '<br><hr ALIGN=LEFT SIZE=5 NOSHADE WIDTH="80%">' + '\n';
-
-}
-
-function getFontList()
-{
-  try
-  {
-    netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-    netscape.security.PrivilegeManager.enablePrivilege("UniversalBrowserRead");
-
-    var fontListObj = Components.classes["@mozilla.org/gfx/fontlist;1"].createInstance();
-    if (fontListObj)
-       fontListObj = fontListObj.QueryInterface(Components.interfaces.nsIFontList);
-    /*
-     this can be done in a single stmt.
-    var fontListObj = Components.classes["@mozilla.org/gfx/fontlist;1"].
-                      createInstance(Components.interfaces.nsIFontList);
-    */
-  }
-  catch(e) {
-    alert("Exception: " + e);
-  }
-  return fontListObj;
-}
-
-function getDescription(groupname)
-{
-  var descriptivename;
-  if(groupname == "x-western")
-    descriptivename = " (American/Western European)";
-  else if(groupname == "ar")
-    descriptivename = " (Arabic)";
-  else if(groupname == "el")
-    descriptivename = " (Greek)";
-  else if(groupname == "he")
-    descriptivename = " (Hebrew)";
-  else if(groupname == "ja")
-    descriptivename = " (Japanese)";
-  else if(groupname == "ko")
-    descriptivename = " (Korean)";
-  else if(groupname == "th")
-    descriptivename = " (Thai)";
-  else if(groupname == "tr")
-    descriptivename = " (Turkish)";
-  else if(groupname == "x-baltic")
-    descriptivename = " (Baltic)";
-  else if(groupname == "x-central-euro")
-    descriptivename = " (Eastern European)";
-  else if(groupname == "x-cyrillic")
-    descriptivename = " (Russian)";
-  else if(groupname == "zh-CN")
-    descriptivename = " (China)";
-  else if(groupname == "zh-TW")
-    descriptivename = " (Taiwan)";
-
-  return descriptivename;
-}
-
-function constructFontList(fontList)
-{
-  try
-  {
-    netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-    netscape.security.PrivilegeManager.enablePrivilege("UniversalBrowserRead");
-
-    res = res + '<b><h3><font color="#CC6600"> Available Fonts </font></h3></b>' + '\n';
-    for(i=0; i<langgroup.length; i++)
-    {
-      res = res + '<br><b><u>' + langgroup[i] + '</u>' + getDescription(langgroup[i]) + '</b> <br><br>';
-      res = res + '<table BORDER COLS=2 WIDTH="90%">' + '\n';
-      for(j=0; j<fonttype.length; j++)
-      {
-        res = res + '<tr>' + '\n';
-        res = res + '<td WIDTH="20%"><b>' + fonttype[j] + ':' + '</b></td>';
-        res = res + '<td>';
-
-        var tempres = "";
-        var fontEnumerator = fontList.availableFonts(langgroup[i], fonttype[j]);
-        while (fontEnumerator.hasMoreElements())
-		{
-		  var fontName = fontEnumerator.getNext();
-		  fontName = fontName.QueryInterface(Components.interfaces.nsISupportsString);
-		  var fontNameStr = fontName.toString();
-		  if (fontEnumerator.hasMoreElements())
-		    tempres = tempres + fontNameStr + ", ";
-		  else
-		    tempres = tempres + fontNameStr;
-		}
-		res = res + tempres;
-		res = res + '</td>';
-        res = res + ' </tr>' + '\n';
-      }
-      res = res + '</table>';
-    }
-    res = res + '<br><hr ALIGN=LEFT SIZE=5 NOSHADE WIDTH="80%">' + '\n';
-  }
-  catch(e) {
-    alert("Exception: " + e);
-  }
-}
-
-function displayResults()
-{
-  document.results.textarea.value = res;
-  if (top.name == "testWindow")
-  {
- 	fixSubmit();
-  }
-  else
-  {
-  	document.write(document.results.textarea.value);
-  }
-}
-
-</script>
-</head>
-
-<body onLoad="displayResults();">
-
-<!-- form below is ngdriverspecific  -->
-<form name="results" action="/ngdriver/cgi-bin/writeresults.cgi" method="post">
-<script type="text/javascript">
-document.write('<input name="resultsfile" type="hidden" value="' + window.opener.document.resultsform.resultsfile.value + '">');
-</script>
-<input type="hidden" name="textarea">
-</form>
-
-<script type="text/javascript">
-
-var langgroup = new Array("x-western", "ar", "el", "he", "ja", "ko",
-                          "th", "tr", "x-baltic", "x-central-euro",
-                          "x-cyrillic", "zh-CN", "zh-TW");
-var fonttype = new Array( "serif" , "sans-serif", "cursive",
-                          "fantasy", "monospace");
-getBrowserVersion();
-var fontList = getFontList();
-constructFontList(fontList);
-
-</script>
-</body>
-</html>
\ No newline at end of file
--- a/gfx/idl/Makefile.in
+++ b/gfx/idl/Makefile.in
@@ -43,17 +43,16 @@ VPATH		= @srcdir@
 include $(DEPTH)/config/autoconf.mk
 
 MODULE		= gfx
 XPIDL_MODULE	= gfx
 GRE_MODULE	= 1
 
 XPIDLSRCS	= \
 		nsIFontEnumerator.idl \
-		nsIFontList.idl \
 		nsIScriptableRegion.idl \
 		gfxIFormats.idl \
 		gfxIImageFrame.idl \
 		gfxtypes.idl \
 		$(NULL)
 
 include $(topsrcdir)/config/rules.mk
 
deleted file mode 100755
--- a/gfx/idl/nsIFontList.idl
+++ /dev/null
@@ -1,79 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 2001
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *   Brian Stell <bstell@netscape.com>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either of the GNU General Public License Version 2 or later (the "GPL"),
- * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#include "nsISupports.idl"
-
-interface nsISimpleEnumerator;
-
-/**
- * The nsIFontList interface provides an application the  
- * necessary information so that the user can select the font to use 
- * as the default style sheet. This is used if the style sheet is 
- * missing or does not specify a font.
- * <P>Font lists are specified per language group.
- *
- */
-
-[scriptable, uuid(702909c6-1dd2-11b2-b833-8a740f643539)]
-interface nsIFontList : nsISupports
-{
-    
-  /**
-   * Get the list of available fonts for a language group
-   * and for use as the given CSS generic font.
-   *
-   * @param aLangGroup limits the fonts to fonts in a language 
-   *          group; eg: x-western (American/Western European), 
-   *          ar (Arabic), el (Greek), he (Hebrew), ja (Japanese),
-   *          ko (Korean), th (Thai), tr (Turkish),
-   *          x-baltic (Baltic), x-central-euro (Eastern European),
-   *          x-cyrillic (Russian), zh-CN (China), zh-TW (Taiwan)
-   *
-   * @param aFontType limits the fonts to the fonts with this CSS 
-   *          generic font type; eg: serif, sans-serif, cursive,
-   *          fantasy, monospace.
-   *
-   * @return a simple enumerator of the available fonts for a 
-   *          language group / generic type.  These strings are
-   *          the text supplied by the operating system's font 
-   *          system.
-   */
-  nsISimpleEnumerator availableFonts(in wstring aLangGroup, 
-                                     in wstring aFontType);
-};
-
--- a/gfx/public/nsGfxCIID.h
+++ b/gfx/public/nsGfxCIID.h
@@ -57,34 +57,25 @@
 #define NS_FONT_METRICS_CID \
 { 0x6049b263, 0xc1e6, 0x11d1, \
 { 0xa8, 0x27, 0x00, 0x40, 0x95, 0x9a, 0x28, 0xc9 } }
 
 #define NS_FONT_ENUMERATOR_CID \
 { 0xa6cf9115, 0x15b3, 0x11d2, \
 { 0x93, 0x2e, 0x00, 0x80, 0x5f, 0x8a, 0xdd, 0x32 } }
 
-#define NS_FONTLIST_CID \
-{ 0x6a8c0dd4, 0x1dd2, 0x11b2, \
-{ 0x9a, 0x8f, 0xf8, 0x2f, 0x9d, 0xf2, 0x5b, 0x07 } }
-
 #define NS_REGION_CID \
 { 0xe12752f0, 0xee9a, 0x11d1, \
 { 0xa8, 0x2a, 0x00, 0x40, 0x95, 0x9a, 0x28, 0xc9 } }
 
 #define NS_SCRIPTABLE_REGION_CID \
 { 0xda5b130a, 0x1dd1, 0x11b2, \
 { 0xad, 0x47, 0xf4, 0x55, 0xb1, 0x81, 0x4a, 0x78 } }
 
 #define NS_BLENDER_CID \
 { 0x6049b264, 0xc1e6, 0x11d1, \
 { 0xa8, 0x27, 0x00, 0x40, 0x95, 0x9a, 0x28, 0xc9 } }
 
 #define NS_DRAWING_SURFACE_CID \
 { 0x199c7040, 0xcab0, 0x11d2, \
 { 0xa8, 0x49, 0x00, 0x40, 0x95, 0x9a, 0x28, 0xc9 } }
 
-#define NS_FONTCATALOGSERVICE_CID \
-{ 0xa3057187, 0xc40f, 0x4ffa, \
-{ 0x91, 0x60, 0x2b, 0x16, 0x48, 0x20, 0x53, 0xb1 } }
-
-
 #endif
--- a/gfx/src/Makefile.in
+++ b/gfx/src/Makefile.in
@@ -72,17 +72,16 @@ ifdef MOZ_ENABLE_PHOTON
 DIRS        += photon
 endif
 
 CPPSRCS = \
         nsColor.cpp \
         nsColorNames.cpp \
         nsDeviceContext.cpp \
         nsFont.cpp \
-        nsFontList.cpp \
         nsRect.cpp \
         nsRegion.cpp \
         nsTransform2D.cpp \
         nsScriptableRegion.cpp \
         $(NULL)
 
 ifeq (,$(filter windows,$(MOZ_WIDGET_TOOLKIT)))
 REQUIRES += uconv
--- a/gfx/src/beos/nsGfxFactoryBeOS.cpp
+++ b/gfx/src/beos/nsGfxFactoryBeOS.cpp
@@ -41,29 +41,27 @@
 #include "nsGfxCIID.h" 
  
 #include "nsBlender.h" 
 #include "nsFontMetricsBeOS.h"
 #include "nsRenderingContextBeOS.h"
 #include "nsScriptableRegion.h" 
 #include "nsDeviceContextBeOS.h" 
 #include "nsImageBeOS.h" 
-#include "nsFontList.h"
 #include "gfxImageFrame.h"
 
 // objects that just require generic constructors 
 
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsFontMetricsBeOS) 
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsDeviceContextBeOS) 
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsRenderingContextBeOS) 
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsImageBeOS) 
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsBlender) 
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsRegionBeOS) 
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsFontEnumeratorBeOS) 
-NS_GENERIC_FACTORY_CONSTRUCTOR(nsFontList)
 
 NS_GENERIC_FACTORY_CONSTRUCTOR(gfxImageFrame)
  
 // our custom constructors 
  
 static NS_IMETHODIMP nsScriptableRegionConstructor(nsISupports *aOuter, REFNSIID aIID, void **aResult) 
 { 
   nsresult rv; 
@@ -141,20 +139,15 @@ static const nsModuleComponentInfo compo
     //    "@mozilla.org/gfx/blender;1", 
     "@mozilla.org/gfx/blender;1", 
     nsBlenderConstructor }, 
   { "BeOS Font Enumerator", 
     NS_FONT_ENUMERATOR_CID, 
     //    "@mozilla.org/gfx/font_enumerator/beos;1", 
     "@mozilla.org/gfx/fontenumerator;1", 
     nsFontEnumeratorBeOSConstructor }, 
-  { "Font List",  
-    NS_FONTLIST_CID,
-    //    "@mozilla.org/gfx/fontlist;1"
-    NS_FONTLIST_CONTRACTID,
-    nsFontListConstructor },
   { "windows image frame",
     GFX_IMAGEFRAME_CID,
     "@mozilla.org/gfx/image/frame;2",
     gfxImageFrameConstructor, },
 };   
 
 NS_IMPL_NSGETMODULE(nsGfxBeOSModule, components) 
--- a/gfx/src/mac/nsGfxFactoryMac.cpp
+++ b/gfx/src/mac/nsGfxFactoryMac.cpp
@@ -34,19 +34,17 @@
  * the provisions above, a recipient may use your version of this file under
  * the terms of any one of the MPL, the GPL or the LGPL.
  *
  * ***** END LICENSE BLOCK ***** */
 
 #include "nscore.h"
 #include "nsIFactory.h"
 #include "nsISupports.h"
-#include "nsIFontList.h"
 #include "nsGfxCIID.h"
-#include "nsFontList.h"
 #include "nsFontMetricsMac.h"
 #include "nsRenderingContextMac.h"
 #include "nsImageMac.h"
 #include "nsDeviceContextMac.h"
 #include "nsRegionMac.h"
 #include "nsScriptableRegion.h"
 #include "nsBlender.h"
 #include "nsCOMPtr.h"
@@ -59,17 +57,16 @@
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsFontMetricsMac)
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsDeviceContextMac)
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsRenderingContextMac)
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsImageMac)
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsRegionMac)
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsBlender)
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsDrawingSurfaceMac)
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsFontEnumeratorMac)
-NS_GENERIC_FACTORY_CONSTRUCTOR(nsFontList)
 NS_GENERIC_FACTORY_CONSTRUCTOR(gfxImageFrame)
 
 static NS_IMETHODIMP
 nsScriptableRegionConstructor(nsISupports* aOuter, REFNSIID aIID, void** aResult)
 {
   NS_ENSURE_NO_AGGREGATION(aOuter);
   NS_ENSURE_ARG_POINTER(aResult);
   *aResult = nsnull;
@@ -113,20 +110,16 @@ static const nsModuleComponentInfo compo
   { "nsDrawingSurface",
     NS_DRAWING_SURFACE_CID,
     "@mozilla.org/gfx/drawing-surface;1",
     nsDrawingSurfaceMacConstructor },
   { "nsFontEnumerator",
     NS_FONT_ENUMERATOR_CID,
     "@mozilla.org/gfx/fontenumerator;1",
     nsFontEnumeratorMacConstructor },
-  { "nsFontList",
-    NS_FONTLIST_CID,
-    "@mozilla.org/gfx/fontlist;1",
-    nsFontListConstructor },
   { "windows image frame",
     GFX_IMAGEFRAME_CID,
     "@mozilla.org/gfx/image/frame;2",
     gfxImageFrameConstructor, },
 };
 
 PR_STATIC_CALLBACK(void)
 nsGfxMacModuleDtor(nsIModule *self)
deleted file mode 100644
--- a/gfx/src/nsFontList.cpp
+++ /dev/null
@@ -1,174 +0,0 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Communicator client code, released
- * March 31, 1998.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 2001
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *   Brian Stell <bstell@netscape.com>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either of the GNU General Public License Version 2 or later (the "GPL"),
- * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/*
- * Implementation of nsIFontList
- */
-
-#include "nsCOMPtr.h"
-#include "nsXPCOM.h"
-#include "nsFontList.h"
-#include "nsGfxCIID.h"
-#include "nsDependentString.h"
-#include "nsIFontEnumerator.h"
-#include "nsISimpleEnumerator.h"
-#include "nsISupportsPrimitives.h"
-#include "nsMemory.h"
-#include "nsReadableUtils.h"
-#include "nsXPIDLString.h"
-
-static NS_DEFINE_IID(kCFontEnumerator, NS_FONT_ENUMERATOR_CID);
-
-nsFontList::nsFontList()
-{
-}
-
-nsFontList::~nsFontList()
-{
-}
-
-NS_IMPL_ISUPPORTS1(nsFontList,nsIFontList)
-
-/* font list enumerator */
-class
-nsFontListEnumerator : public nsISimpleEnumerator
-{
-  public:
-    nsFontListEnumerator();
-    virtual ~nsFontListEnumerator();
-
-    // nsISupports interface
-    NS_DECL_ISUPPORTS
-
-    // nsISimpleEnumerator interface
-    NS_DECL_NSISIMPLEENUMERATOR
-
-    NS_IMETHOD Init(const PRUnichar *aLangGroup, const PRUnichar *aFontType);
-
-
-  protected:
-    PRUnichar **mFonts;
-    PRUint32 mCount;
-    PRUint32 mIndex;
-};
-
-nsFontListEnumerator::nsFontListEnumerator() :
-  mFonts(nsnull), mCount(0), mIndex(0)
-{
-}
-
-nsFontListEnumerator::~nsFontListEnumerator()
-{
-  if (mFonts) {
-    PRUint32 i;
-    for (i=0; i<mCount; i++) {
-      nsMemory::Free(mFonts[i]);
-    }
-    nsMemory::Free(mFonts);
-  }
-}
-
-NS_IMPL_ISUPPORTS1(nsFontListEnumerator, nsISimpleEnumerator)
-
-NS_IMETHODIMP
-nsFontListEnumerator::Init(const PRUnichar *aLangGroup, 
-                           const PRUnichar *aFontType)
-{
-  nsresult rv;
-  nsCOMPtr<nsIFontEnumerator> fontEnumerator;
-
-  fontEnumerator = do_CreateInstance(kCFontEnumerator, &rv);
-  if (NS_FAILED(rv))
-    return rv;
- 
-  nsXPIDLCString langGroup;
-  langGroup.Adopt(ToNewUTF8String(nsDependentString(aLangGroup)));
-  nsXPIDLCString fontType;
-  fontType.Adopt(ToNewUTF8String(nsDependentString(aFontType)));
-  rv = fontEnumerator->EnumerateFonts(langGroup.get(), fontType.get(), 
-                                        &mCount, &mFonts);
-  return rv;
-}
-
-NS_IMETHODIMP
-nsFontListEnumerator::HasMoreElements(PRBool *result)
-{
-  *result = (mIndex < mCount);
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsFontListEnumerator::GetNext(nsISupports **aFont)
-{
-  NS_ENSURE_ARG_POINTER(aFont);
-  *aFont = nsnull;
-  if (mIndex >= mCount) {
-    return NS_ERROR_UNEXPECTED;
-  }
-  PRUnichar *fontName = mFonts[mIndex++];
-  nsCOMPtr<nsISupportsString> fontNameWrapper;
-  nsresult rv;
-  fontNameWrapper = do_CreateInstance(NS_SUPPORTS_STRING_CONTRACTID, &rv);
-  NS_ENSURE_SUCCESS(rv, rv);
-  NS_ENSURE_TRUE(fontNameWrapper, NS_ERROR_OUT_OF_MEMORY);
-  fontNameWrapper->SetData(nsDependentString(fontName));
-  *aFont = static_cast<nsISupports*>(fontNameWrapper);
-  NS_ADDREF(*aFont);
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsFontList::AvailableFonts(const PRUnichar *aLangGroup, 
-                           const PRUnichar *aFontType, 
-                           nsISimpleEnumerator **aFontEnumerator)
-{
-  NS_ENSURE_ARG(aLangGroup);
-  NS_ENSURE_ARG(aFontType);
-  NS_ENSURE_ARG_POINTER(aFontEnumerator);
-  nsCOMPtr<nsFontListEnumerator> fontListEnum = new nsFontListEnumerator();
-  NS_ENSURE_TRUE(fontListEnum.get(), NS_ERROR_OUT_OF_MEMORY);
-
-  nsresult rv = fontListEnum->Init(aLangGroup, aFontType);
-  NS_ENSURE_SUCCESS(rv, rv);
-
-  *aFontEnumerator = static_cast<nsISimpleEnumerator*>(fontListEnum);
-  NS_ADDREF(*aFontEnumerator);
-  return NS_OK;
-}
-
deleted file mode 100644
--- a/gfx/src/nsFontList.h
+++ /dev/null
@@ -1,69 +0,0 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Communicator client code, released
- * March 31, 1998.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 2001
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *   Brian Stell <bstell@netscape.com>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either of the GNU General Public License Version 2 or later (the "GPL"),
- * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/*
- * Implementation of nsIFontList
- */
-
-#ifndef _nsFontList_H_
-#define _nsFontList_H_
-
-#include "nsIFontList.h"
-#include "gfxCore.h"
-
-#define NS_FONTLIST_CONTRACTID "@mozilla.org/gfx/fontlist;1"
-
-
-class NS_GFX nsFontList : public nsIFontList
-{
-public:
-  nsFontList();
-  virtual ~nsFontList();
-
-  // nsISupports
-  NS_DECL_ISUPPORTS
-
-  // nsIFontList
-  NS_DECL_NSIFONTLIST
-
-protected:
-
-};
-
-#endif /* _nsFontList_H_ */
--- a/gfx/src/photon/nsGfxFactoryPh.cpp
+++ b/gfx/src/photon/nsGfxFactoryPh.cpp
@@ -45,30 +45,28 @@
 #include "nsFontMetricsPh.h"
 #include "nsRenderingContextPh.h"
 #include "nsDeviceContextSpecPh.h"
 #include "nsScreenManagerPh.h"
 #include "nsScriptableRegion.h"
 #include "nsDeviceContextPh.h"
 #include "nsPrintOptionsPh.h"
 #include "nsPrintSession.h"
-#include "nsFontList.h"
 #include "gfxImageFrame.h"
 
 // objects that just require generic constructors
 
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsFontMetricsPh)
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsDeviceContextPh)
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsRenderingContextPh)
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsImagePh)
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsBlender)
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsRegionPh)
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsDeviceContextSpecPh)
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsFontEnumeratorPh)
-NS_GENERIC_FACTORY_CONSTRUCTOR(nsFontList)
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsScreenManagerPh)
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsPrinterEnumeratorPh)
 NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsPrintOptionsPh, Init)
 NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsPrintSession, Init)
 NS_GENERIC_FACTORY_CONSTRUCTOR(gfxImageFrame)
 
 // our custom constructors
 
@@ -160,21 +158,16 @@ static const nsModuleComponentInfo compo
 		"@mozilla.org/gfx/printsettings-service;1",
     nsPrintOptionsPhConstructor },
 
    { "Ph Font Enumerator",
     NS_FONT_ENUMERATOR_CID,
     "@mozilla.org/gfx/fontenumerator;1",
     nsFontEnumeratorPhConstructor },
 
-	{ "Font List",
-		NS_FONTLIST_CID,
-		NS_FONTLIST_CONTRACTID,
-		nsFontListConstructor },
-
   { "Ph Screen Manager",
     NS_SCREENMANAGER_CID,
     "@mozilla.org/gfx/screenmanager;1",
     nsScreenManagerPhConstructor },
 
 	{ "Ph Printer Enumerator",
 	  NS_PRINTER_ENUMERATOR_CID,
 	"@mozilla.org/gfx/printerenumerator;1",
--- a/gfx/src/windows/nsGfxFactoryWin.cpp
+++ b/gfx/src/windows/nsGfxFactoryWin.cpp
@@ -41,31 +41,29 @@
 #include "nsGfxCIID.h"
 #include "nsFontMetricsWin.h"
 #include "nsRenderingContextWin.h"
 #include "nsImageWin.h"
 #include "nsDeviceContextWin.h"
 #include "nsRegionWin.h"
 #include "nsBlender.h"
 #include "nsScriptableRegion.h"
-#include "nsFontList.h"
 #include "nsIGenericFactory.h"
 #include "gfxImageFrame.h"
 
 
 //NS_GENERIC_FACTORY_CONSTRUCTOR(nsFontMetricsWin)
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsDeviceContextWin)
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsRenderingContextWin)
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsImageWin)
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsRegionWin)
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsBlender)
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsDrawingSurfaceWin)
 //NS_GENERIC_FACTORY_CONSTRUCTOR(nsScriptableRegion)
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsFontEnumeratorWin)
-NS_GENERIC_FACTORY_CONSTRUCTOR(nsFontList)
 NS_GENERIC_FACTORY_CONSTRUCTOR(gfxImageFrame)
 
 PRBool
 UseAFunctions()
 {
 #ifndef WINCE
   static PRBool useAFunctions = PR_FALSE;
   static PRBool init = PR_FALSE;
@@ -180,20 +178,15 @@ static const nsModuleComponentInfo compo
     "@mozilla.org/gfx/region;1",
     nsScriptableRegionConstructor },
 
   { "nsFontEnumeratorWin",
     NS_FONT_ENUMERATOR_CID,
     "@mozilla.org/gfx/fontenumerator;1",
     nsFontEnumeratorWinConstructor },
 
-  { "nsFontList",
-    NS_FONTLIST_CID,
-    "@mozilla.org/gfx/fontlist;1",
-    nsFontListConstructor },
-
   { "windows image frame",
     GFX_IMAGEFRAME_CID,
     "@mozilla.org/gfx/image/frame;2",
     gfxImageFrameConstructor, },
 };
 
 NS_IMPL_NSGETMODULE(nsGfxModule, components)