bug 147419 remove ununsed plexName colorspace resolutionName and downloadFonts r=roc
authorKarl Tomlinson <karlt+@karlt.net>
Thu, 11 Jun 2015 09:34:27 +1200
changeset 280077 78349b2422e81ef8b36264327ad41a8999f05547
parent 280076 86f5957e60f9f5b2e466ea2f02a46955bbfc50a8
child 280078 47b6fd494f734708c66d8d220cf5518f48e7064a
push id4932
push userjlund@mozilla.com
push dateMon, 10 Aug 2015 18:23:06 +0000
treeherdermozilla-beta@6dd5a4f5f745 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersroc
bugs147419
milestone41.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
bug 147419 remove ununsed plexName colorspace resolutionName and downloadFonts r=roc This was only used to write to and read from otherwise unused preferences.
embedding/components/printingui/ipc/PPrintingTypes.ipdlh
toolkit/components/printing/content/printdialog.js
toolkit/components/printing/content/printjoboptions.js
toolkit/components/printing/content/printjoboptions.xul
toolkit/locales/en-US/chrome/global/printjoboptions.dtd
widget/gtk/nsDeviceContextSpecG.cpp
widget/nsIPrintSettings.idl
widget/nsPrintOptionsImpl.cpp
widget/nsPrintSettingsImpl.cpp
widget/nsPrintSettingsImpl.h
--- a/embedding/components/printingui/ipc/PPrintingTypes.ipdlh
+++ b/embedding/components/printingui/ipc/PPrintingTypes.ipdlh
@@ -48,20 +48,16 @@ struct PrintData {
   bool showPrintProgress;
 
   nsString paperName;
   short paperSizeType;
   short paperData;
   double paperWidth;
   double paperHeight;
   short paperSizeUnit;
-  nsString plexName;
-  nsString colorspace;
-  nsString resolutionName;
-  bool downloadFonts;
   bool printReversed;
   bool printInColor;
   int32_t orientation;
   int32_t numCopies;
   nsString printerName;
   bool printToFile;
   nsString toFileName;
   short outputFormat;
--- a/toolkit/components/printing/content/printdialog.js
+++ b/toolkit/components/printing/content/printdialog.js
@@ -367,21 +367,18 @@ function onAccept()
   }
 
   var saveToPrefs = false;
 
   saveToPrefs = gPrefs.getBoolPref("print.save_print_settings");
 
   if (saveToPrefs && printService != null) {
     var flags = gPrintSetInterface.kInitSavePaperSize      | 
-                gPrintSetInterface.kInitSaveColorSpace     |
                 gPrintSetInterface.kInitSaveEdges          |
                 gPrintSetInterface.kInitSaveInColor        |
-                gPrintSetInterface.kInitSaveResolutionName |
-                gPrintSetInterface.kInitSaveDownloadFonts  |
                 gPrintSetInterface.kInitSaveShrinkToFit    |
                 gPrintSetInterface.kInitSaveScaling;
     printService.savePrintSettingsToPrefs(gPrintSettings, true, flags);
   }
 
   // set return value to "print"
   if (paramBlock) {
     paramBlock.SetInt(0, 1);
--- a/toolkit/components/printing/content/printjoboptions.js
+++ b/toolkit/components/printing/content/printjoboptions.js
@@ -4,19 +4,16 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 var dialog;
 var gPrintBundle;
 var gPrintSettings = null;
 var gPrintSettingsInterface  = Components.interfaces.nsIPrintSettings;
 var gPaperArray;
-var gPlexArray;
-var gResolutionArray;
-var gColorSpaceArray;
 var gPrefs;
 
 var gPrintSetInterface = Components.interfaces.nsIPrintSettings;
 var doDebug            = true;
 
 //---------------------------------------------------
 function checkDouble(element, maxVal)
 {
@@ -61,37 +58,25 @@ function initDialog()
 {
   gPrintBundle = document.getElementById("printBundle");
 
   dialog = new Object;
 
   dialog.paperList       = document.getElementById("paperList");
   dialog.paperGroup      = document.getElementById("paperGroup");
 
-  dialog.plexList        = document.getElementById("plexList");
-  dialog.plexGroup       = document.getElementById("plexGroup");
-
-  dialog.resolutionList  = document.getElementById("resolutionList");
-  dialog.resolutionGroup = document.getElementById("resolutionGroup");
-
   dialog.jobTitleLabel   = document.getElementById("jobTitleLabel");
   dialog.jobTitleGroup   = document.getElementById("jobTitleGroup");
   dialog.jobTitleInput   = document.getElementById("jobTitleInput");
     
-  dialog.colorspaceList  = document.getElementById("colorspaceList");
-  dialog.colorspaceGroup = document.getElementById("colorspaceGroup");
-
   dialog.colorGroup      = document.getElementById("colorGroup");
   dialog.colorRadioGroup = document.getElementById("colorRadioGroup");
   dialog.colorRadio      = document.getElementById("colorRadio");
   dialog.grayRadio       = document.getElementById("grayRadio");
 
-  dialog.fontsGroup      = document.getElementById("fontsGroup");
-  dialog.downloadFonts   = document.getElementById("downloadFonts");
-
   dialog.topInput        = document.getElementById("topInput");
   dialog.bottomInput     = document.getElementById("bottomInput");
   dialog.leftInput       = document.getElementById("leftInput");
   dialog.rightInput      = document.getElementById("rightInput");
 }
 
 //---------------------------------------------------
 function round10(val)
@@ -240,384 +225,45 @@ function createPaperSizeList(selectedInx
   if (selectedInx > -1) {
     selectElement.paperListElement.selectedIndex = selectedInx;
   }
 
   //dialog.paperList = selectElement;
 }
 
 //---------------------------------------------------
-function plexListElement(aPlexListElement)
-  {
-    this.plexListElement = aPlexListElement;
-  }
-
-plexListElement.prototype =
-  {
-    clearPlexList:
-      function ()
-        {
-          // remove the menupopup node child of the menulist.
-          this.plexListElement.removeChild(this.plexListElement.firstChild);
-        },
-
-    appendPlexNames: 
-      function (aDataObject) 
-        { 
-          var popupNode = document.createElement("menupopup"); 
-          for (var i=0;i<aDataObject.length;i++)  {
-            var plexObj = aDataObject[i];
-            var itemNode = document.createElement("menuitem");
-            var label;
-            try {
-              label = gPrintBundle.getString(plexObj.name);
-            } 
-            catch (e) {
-              /* No name in string bundle ? Then build one manually (this
-               * usually happens when gPlexArray was build by createPlexArrayFromPrinterFeatures() ...) */              
-              label = plexObj.name;
-            }
-            itemNode.setAttribute("label", label);
-            itemNode.setAttribute("value", i);
-            popupNode.appendChild(itemNode);            
-          }
-          this.plexListElement.appendChild(popupNode); 
-        } 
-  };
-
-
-//---------------------------------------------------
-function createPlexArrayFromDefaults()
-{
-  var plexNames = ["default"];
-
-  gPlexArray = new Array();
-
-  for (var i=0;i<plexNames.length;i++) {
-    var obj    = new Object();
-    obj.name   = plexNames[i];
-    
-    gPlexArray[i] = obj;
-  }
-}
-
-//---------------------------------------------------
-function createPlexArrayFromPrinterFeatures()
-{
-  var printername = gPrintSettings.printerName;
-  if (doDebug) {
-    dump("createPlexArrayFromPrinterFeatures for " + printername + ".\n");
-  }
-
-  gPlexArray = new Array();
-  
-  var numPlexs = gPrefs.getIntPref("print.tmp.printerfeatures." + printername + ".plex.count");
-  
-  if (doDebug) {
-    dump("processing " + numPlexs + " entries...\n");
-  }    
-
-  for ( var i=0 ; i < numPlexs ; i++ ) {
-    var obj = new Object();
-    obj.name = gPrefs.getCharPref("print.tmp.printerfeatures." + printername + ".plex." + i + ".name");
-
-    gPlexArray[i] = obj;
-
-    if (doDebug) {
-      dump("plex index=" + i + ", name='" + obj.name + "'.\n");
-    }
-  }  
-}
-
-//---------------------------------------------------
-function createPlexArray()
-{  
-  if (isListOfPrinterFeaturesAvailable()) {
-    createPlexArrayFromPrinterFeatures();    
-  }
-  else {
-    createPlexArrayFromDefaults();
-  }
-}
-
-//---------------------------------------------------
-function createPlexNameList(selectedInx)
-{
-  var selectElement = new plexListElement(dialog.plexList);
-  selectElement.clearPlexList();
-
-  selectElement.appendPlexNames(gPlexArray);
-
-  if (selectedInx > -1) {
-    selectElement.plexListElement.selectedIndex = selectedInx;
-  }
-
-  //dialog.plexList = selectElement;
-}   
-
-//---------------------------------------------------
-function resolutionListElement(aResolutionListElement)
-  {
-    this.resolutionListElement = aResolutionListElement;
-  }
-
-resolutionListElement.prototype =
-  {
-    clearResolutionList:
-      function ()
-        {
-          // remove the menupopup node child of the menulist.
-          this.resolutionListElement.removeChild(this.resolutionListElement.firstChild);
-        },
-
-    appendResolutionNames: 
-      function (aDataObject) 
-        { 
-          var popupNode = document.createElement("menupopup"); 
-          for (var i=0;i<aDataObject.length;i++)  {
-            var resolutionObj = aDataObject[i];
-            var itemNode = document.createElement("menuitem");
-            var label;
-            try {
-              label = gPrintBundle.getString(resolutionObj.name);
-            } 
-            catch (e) {
-              /* No name in string bundle ? Then build one manually (this
-               * usually happens when gResolutionArray was build by createResolutionArrayFromPrinterFeatures() ...) */              
-              label = resolutionObj.name;
-            }
-            itemNode.setAttribute("label", label);
-            itemNode.setAttribute("value", i);
-            popupNode.appendChild(itemNode);            
-          }
-          this.resolutionListElement.appendChild(popupNode); 
-        } 
-  };
-
-
-//---------------------------------------------------
-function createResolutionArrayFromDefaults()
-{
-  var resolutionNames = ["default"];
-
-  gResolutionArray = new Array();
-
-  for (var i=0;i<resolutionNames.length;i++) {
-    var obj    = new Object();
-    obj.name   = resolutionNames[i];
-    
-    gResolutionArray[i] = obj;
-  }
-}
-
-//---------------------------------------------------
-function createResolutionArrayFromPrinterFeatures()
-{
-  var printername = gPrintSettings.printerName;
-  if (doDebug) {
-    dump("createResolutionArrayFromPrinterFeatures for " + printername + ".\n");
-  }
-
-  gResolutionArray = new Array();
-  
-  var numResolutions = gPrefs.getIntPref("print.tmp.printerfeatures." + printername + ".resolution.count");
-  
-  if (doDebug) {
-    dump("processing " + numResolutions + " entries...\n");
-  }    
-
-  for ( var i=0 ; i < numResolutions ; i++ ) {
-    var obj = new Object();
-    obj.name = gPrefs.getCharPref("print.tmp.printerfeatures." + printername + ".resolution." + i + ".name");
-
-    gResolutionArray[i] = obj;
-
-    if (doDebug) {
-      dump("resolution index=" + i + ", name='" + obj.name + "'.\n");
-    }
-  }  
-}
-
-//---------------------------------------------------
-function createResolutionArray()
-{  
-  if (isListOfPrinterFeaturesAvailable()) {
-    createResolutionArrayFromPrinterFeatures();    
-  }
-  else {
-    createResolutionArrayFromDefaults();
-  }
-}
-
-//---------------------------------------------------
-function createResolutionNameList(selectedInx)
-{
-  var selectElement = new resolutionListElement(dialog.resolutionList);
-  selectElement.clearResolutionList();
-
-  selectElement.appendResolutionNames(gResolutionArray);
-
-  if (selectedInx > -1) {
-    selectElement.resolutionListElement.selectedIndex = selectedInx;
-  }
-
-  //dialog.resolutionList = selectElement;
-}  
-
-//---------------------------------------------------
-function colorspaceListElement(aColorspaceListElement)
-  {
-    this.colorspaceListElement = aColorspaceListElement;
-  }
-
-colorspaceListElement.prototype =
-  {
-    clearColorspaceList:
-      function ()
-        {
-          // remove the menupopup node child of the menulist.
-          this.colorspaceListElement.removeChild(this.colorspaceListElement.firstChild);
-        },
-
-    appendColorspaceNames: 
-      function (aDataObject) 
-        { 
-          var popupNode = document.createElement("menupopup"); 
-          for (var i=0;i<aDataObject.length;i++)  {
-            var colorspaceObj = aDataObject[i];
-            var itemNode = document.createElement("menuitem");
-            var label;
-            try {
-              label = gPrintBundle.getString(colorspaceObj.name);
-            } 
-            catch (e) {
-              /* No name in string bundle ? Then build one manually (this
-               * usually happens when gColorspaceArray was build by createColorspaceArrayFromPrinterFeatures() ...) */              
-              label = colorspaceObj.name;
-            }
-            itemNode.setAttribute("label", label);
-            itemNode.setAttribute("value", i);
-            popupNode.appendChild(itemNode);            
-          }
-          this.colorspaceListElement.appendChild(popupNode); 
-        } 
-  };
-
-
-//---------------------------------------------------
-function createColorspaceArrayFromDefaults()
-{
-  var colorspaceNames = ["default"];
-
-  gColorspaceArray = new Array();
-
-  for (var i=0;i<colorspaceNames.length;i++) {
-    var obj    = new Object();
-    obj.name   = colorspaceNames[i];
-    
-    gColorspaceArray[i] = obj;
-  }
-}
-
-//---------------------------------------------------
-function createColorspaceArrayFromPrinterFeatures()
-{
-  var printername = gPrintSettings.printerName;
-  if (doDebug) {
-    dump("createColorspaceArrayFromPrinterFeatures for " + printername + ".\n");
-  }
-
-  gColorspaceArray = new Array();
-  
-  var numColorspaces = gPrefs.getIntPref("print.tmp.printerfeatures." + printername + ".colorspace.count");
-  
-  if (doDebug) {
-    dump("processing " + numColorspaces + " entries...\n");
-  }    
-
-  for ( var i=0 ; i < numColorspaces ; i++ ) {
-    var obj = new Object();
-    obj.name = gPrefs.getCharPref("print.tmp.printerfeatures." + printername + ".colorspace." + i + ".name");
-
-    gColorspaceArray[i] = obj;
-
-    if (doDebug) {
-      dump("colorspace index=" + i + ", name='" + obj.name + "'.\n");
-    }
-  }  
-}
-
-//---------------------------------------------------
-function createColorspaceArray()
-{  
-  if (isListOfPrinterFeaturesAvailable()) {
-    createColorspaceArrayFromPrinterFeatures();    
-  }
-  else {
-    createColorspaceArrayFromDefaults();
-  }
-}
-
-//---------------------------------------------------
-function createColorspaceNameList(selectedInx)
-{
-  var selectElement = new colorspaceListElement(dialog.colorspaceList);
-  selectElement.clearColorspaceList();
-
-  selectElement.appendColorspaceNames(gColorspaceArray);
-
-  if (selectedInx > -1) {
-    selectElement.colorspaceListElement.selectedIndex = selectedInx;
-  }
-
-  //dialog.colorspaceList = selectElement;
-}  
-
-//---------------------------------------------------
 function loadDialog()
 {
   var print_paper_type       = 0;
   var print_paper_unit       = 0;
   var print_paper_width      = 0.0;
   var print_paper_height     = 0.0;
   var print_paper_name       = "";
-  var print_plex_name        = "";
-  var print_resolution_name  = "";
-  var print_colorspace       = "";
   var print_color            = true;
-  var print_downloadfonts    = true;
   var print_jobtitle         = "";
 
   gPrefs = Components.classes["@mozilla.org/preferences-service;1"].getService(Components.interfaces.nsIPrefBranch);
 
   if (gPrintSettings) {
     print_paper_type       = gPrintSettings.paperSizeType;
     print_paper_unit       = gPrintSettings.paperSizeUnit;
     print_paper_width      = gPrintSettings.paperWidth;
     print_paper_height     = gPrintSettings.paperHeight;
     print_paper_name       = gPrintSettings.paperName;
-    print_plex_name        = gPrintSettings.plexName;
-    print_resolution_name  = gPrintSettings.resolutionName;
-    print_colorspace       = gPrintSettings.colorspace;
     print_color            = gPrintSettings.printInColor;
-    print_downloadfonts    = gPrintSettings.downloadFonts;
     print_jobtitle         = gPrintSettings.title;
   }
 
   if (doDebug) {
     dump("loadDialog******************************\n");
     dump("paperSizeType   "+print_paper_unit+"\n");
     dump("paperWidth      "+print_paper_width+"\n");
     dump("paperHeight     "+print_paper_height+"\n");
     dump("paperName       "+print_paper_name+"\n");
-    dump("plexName        "+print_plex_name+"\n");
-    dump("resolutionName  "+print_resolution_name+"\n");
-    dump("colorspace      "+print_colorspace+"\n");
     dump("print_color     "+print_color+"\n");
-    dump("print_downloadfonts "+print_downloadfonts+"\n");
     dump("print_jobtitle   "+print_jobtitle+"\n");
   }
 
   createPaperArray();
 
   var paperSelectedInx = 0;
   for (var i=0;i<gPaperArray.length;i++) { 
     if (print_paper_name == gPaperArray[i].name) {
@@ -630,68 +276,16 @@ function loadDialog()
     if (i == gPaperArray.length)
       dump("loadDialog: No paper found.\n");
     else
       dump("loadDialog: found paper '"+gPaperArray[paperSelectedInx].name+"'.\n");
   }
 
   createPaperSizeList(paperSelectedInx);
 
-  createPlexArray();
-  var plexSelectedInx = 0;
-  for (var i=0;i<gPlexArray.length;i++) { 
-    if (print_plex_name == gPlexArray[i].name) {
-      plexSelectedInx = i;
-      break;
-    }
-  }
-
-  if (doDebug) {
-    if (i == gPlexArray.length)
-      dump("loadDialog: No plex found.\n");
-    else
-      dump("loadDialog: found plex '"+gPlexArray[plexSelectedInx].name+"'.\n");
-  }
-
-  createResolutionArray();
-  var resolutionSelectedInx = 0;
-  for (var i=0;i<gResolutionArray.length;i++) { 
-    if (print_resolution_name == gResolutionArray[i].name) {
-      resolutionSelectedInx = i;
-      break;
-    }
-  }
-  
-  if (doDebug) {
-    if (i == gResolutionArray.length)
-      dump("loadDialog: No resolution found.\n");
-    else
-      dump("loadDialog: found resolution '"+gResolutionArray[resolutionSelectedInx].name+"'.\n");
-  }
-
-  createColorspaceArray();
-  var colorspaceSelectedInx = 0;
-  for (var i=0;i<gColorspaceArray.length;i++) { 
-    if (print_colorspace == gColorspaceArray[i].name) {
-      colorspaceSelectedInx = i;
-      break;
-    }
-  }
-  
-  if (doDebug) {
-    if (i == gColorspaceArray.length)
-      dump("loadDialog: No colorspace found.\n");
-    else
-      dump("loadDialog: found colorspace '"+gColorspaceArray[colorspaceSelectedInx].name+"'.\n");
-  }
-  
-  createPlexNameList(plexSelectedInx);
-  createResolutionNameList(resolutionSelectedInx);
-  createColorspaceNameList(colorspaceSelectedInx);
-    
   /* Enable/disable and/or hide/unhide widgets based in the information
    * whether the selected printer and/or print module supports the matching
    * feature or not */
   if (isListOfPrinterFeaturesAvailable()) {
     // job title
     if (gPrefs.getBoolPref("print.tmp.printerfeatures." + gPrintSettings.printerName + ".can_change_jobtitle"))
       dialog.jobTitleInput.removeAttribute("disabled");
     else
@@ -706,75 +300,33 @@ function loadDialog()
       dialog.paperList.removeAttribute("disabled");
     else
       dialog.paperList.setAttribute("disabled","true");
     if (gPrefs.getBoolPref("print.tmp.printerfeatures." + gPrintSettings.printerName + ".supports_paper_size_change"))
       dialog.paperGroup.removeAttribute("hidden");
     else
       dialog.paperGroup.setAttribute("hidden","true");
             
-    // plex mode
-    if (gPrefs.getBoolPref("print.tmp.printerfeatures." + gPrintSettings.printerName + ".can_change_plex"))
-      dialog.plexList.removeAttribute("disabled");
-    else
-      dialog.plexList.setAttribute("disabled","true");
-    if (gPrefs.getBoolPref("print.tmp.printerfeatures." + gPrintSettings.printerName + ".supports_plex_change"))
-      dialog.plexGroup.removeAttribute("hidden");
-    else
-      dialog.plexGroup.setAttribute("hidden","true");
-
-    // resolution
-    if (gPrefs.getBoolPref("print.tmp.printerfeatures." + gPrintSettings.printerName + ".can_change_resolution"))
-      dialog.resolutionList.removeAttribute("disabled");
-    else
-      dialog.resolutionList.setAttribute("disabled","true");
-    if (gPrefs.getBoolPref("print.tmp.printerfeatures." + gPrintSettings.printerName + ".supports_resolution_change"))
-      dialog.resolutionGroup.removeAttribute("hidden");
-    else
-      dialog.resolutionGroup.setAttribute("hidden","true");
-
     // color/grayscale radio
     if (gPrefs.getBoolPref("print.tmp.printerfeatures." + gPrintSettings.printerName + ".can_change_printincolor"))
       dialog.colorRadioGroup.removeAttribute("disabled");
     else
       dialog.colorRadioGroup.setAttribute("disabled","true");
     if (gPrefs.getBoolPref("print.tmp.printerfeatures." + gPrintSettings.printerName + ".supports_printincolor_change"))
       dialog.colorGroup.removeAttribute("hidden");
     else
       dialog.colorGroup.setAttribute("hidden","true");
-
-    // colorspace
-    if (gPrefs.getBoolPref("print.tmp.printerfeatures." + gPrintSettings.printerName + ".can_change_colorspace"))
-      dialog.colorspaceList.removeAttribute("disabled");
-    else
-      dialog.colorspaceList.setAttribute("disabled","true");
-    if (gPrefs.getBoolPref("print.tmp.printerfeatures." + gPrintSettings.printerName + ".supports_colorspace_change"))
-      dialog.colorspaceGroup.removeAttribute("hidden");
-    else
-      dialog.colorspaceGroup.setAttribute("hidden","true");
-
-    // font download
-    if (gPrefs.getBoolPref("print.tmp.printerfeatures." + gPrintSettings.printerName + ".can_change_downloadfonts"))
-      dialog.downloadFonts.removeAttribute("disabled");
-    else
-      dialog.downloadFonts.setAttribute("disabled","true");
-    if (gPrefs.getBoolPref("print.tmp.printerfeatures." + gPrintSettings.printerName + ".supports_downloadfonts_change"))
-      dialog.fontsGroup.removeAttribute("hidden");
-    else
-      dialog.fontsGroup.setAttribute("hidden","true");
   }
 
   if (print_color) {
     dialog.colorRadioGroup.selectedItem = dialog.colorRadio;
   } else {
     dialog.colorRadioGroup.selectedItem = dialog.grayRadio;
   }
 
-  dialog.downloadFonts.checked = print_downloadfonts;
-
   dialog.jobTitleInput.value = print_jobtitle;
 
   dialog.topInput.value    = gPrintSettings.edgeTop.toFixed(2);
   dialog.bottomInput.value = gPrintSettings.edgeBottom.toFixed(2);
   dialog.leftInput.value   = gPrintSettings.edgeLeft.toFixed(2);
   dialog.rightInput.value  = gPrintSettings.edgeRight.toFixed(2);
 }
 
@@ -801,69 +353,52 @@ function onLoad()
 //---------------------------------------------------
 function onAccept()
 {
   var print_paper_type        = gPrintSettingsInterface.kPaperSizeDefined;
   var print_paper_unit        = gPrintSettingsInterface.kPaperSizeInches;
   var print_paper_width       = 0.0;
   var print_paper_height      = 0.0;
   var print_paper_name        = "";
-  var print_plex_name         = "";
-  var print_resolution_name   = "";
-  var print_colorspace        = "";
 
   if (gPrintSettings != null) {
     var paperSelectedInx = dialog.paperList.selectedIndex;
-    var plexSelectedInx  = dialog.plexList.selectedIndex;
-    var resolutionSelectedInx = dialog.resolutionList.selectedIndex;
-    var colorspaceSelectedInx = dialog.colorspaceList.selectedIndex;
     if (gPaperArray[paperSelectedInx].inches) {
       print_paper_unit = gPrintSettingsInterface.kPaperSizeInches;
     } else {
       print_paper_unit = gPrintSettingsInterface.kPaperSizeMillimeters;
     }
     print_paper_width      = gPaperArray[paperSelectedInx].width;
     print_paper_height     = gPaperArray[paperSelectedInx].height;
     print_paper_name       = gPaperArray[paperSelectedInx].name;
-    print_plex_name        = gPlexArray[plexSelectedInx].name;
-    print_resolution_name  = gResolutionArray[resolutionSelectedInx].name;
-    print_colorspace       = gColorspaceArray[colorspaceSelectedInx].name;
 
     gPrintSettings.paperSizeType   = print_paper_type;
     gPrintSettings.paperSizeUnit   = print_paper_unit;
     gPrintSettings.paperWidth      = print_paper_width;
     gPrintSettings.paperHeight     = print_paper_height;
     gPrintSettings.paperName       = print_paper_name;
-    gPrintSettings.plexName        = print_plex_name;
-    gPrintSettings.resolutionName  = print_resolution_name;
-    gPrintSettings.colorspace      = print_colorspace;
 
     // save these out so they can be picked up by the device spec
     gPrintSettings.printInColor     = dialog.colorRadio.selected;
-    gPrintSettings.downloadFonts    = dialog.downloadFonts.checked;
     gPrintSettings.title            = dialog.jobTitleInput.value;
 
     gPrintSettings.edgeTop          = dialog.topInput.value;
     gPrintSettings.edgeBottom       = dialog.bottomInput.value;
     gPrintSettings.edgeLeft         = dialog.leftInput.value;
     gPrintSettings.edgeRight        = dialog.rightInput.value;
 
     if (doDebug) {
       dump("onAccept******************************\n");
       dump("paperSizeType    "+print_paper_type+" (should be 1)\n");
       dump("paperSizeUnit    "+print_paper_unit+"\n");
       dump("paperWidth       "+print_paper_width+"\n");
       dump("paperHeight      "+print_paper_height+"\n");
       dump("paperName       '"+print_paper_name+"'\n");
-      dump("plexName        '"+print_plex_name+"'\n");
-      dump("resolutionName  '"+print_resolution_name+"'\n");
-      dump("colorspace      '"+print_colorspace+"'\n");
 
       dump("printInColor     "+gPrintSettings.printInColor+"\n");
-      dump("downloadFonts    "+gPrintSettings.downloadFonts+"\n");
     }
   } else {
     dump("************ onAccept gPrintSettings: "+gPrintSettings+"\n");
   }
 
   if (paramBlock) {
     // set return value to "ok"
     paramBlock.SetInt(0, 1);
--- a/toolkit/components/printing/content/printjoboptions.xul
+++ b/toolkit/components/printing/content/printjoboptions.xul
@@ -42,74 +42,29 @@
                  accesskey="&paperInput.accesskey;"
                  control="paperList"/>
         </hbox>
         <menulist id="paperList" flex="1">
           <menupopup/>
         </menulist>
       </row>
 
-      <row id="plexGroup">
-        <hbox align="center" pack="end">
-          <label id="plexLabel"
-                 value="&plexInput.label;"
-                 accesskey="&plexInput.accesskey;"
-                 control="plexList"/>
-        </hbox>
-        <menulist id="plexList" flex="1">
-          <menupopup/>
-        </menulist>
-      </row>
-
-      <row id="resolutionGroup">
-        <hbox align="center" pack="end">
-          <label id="resolutionLabel"
-                 value="&resolutionInput.label;"
-                 accesskey="&resolutionInput.accesskey;"
-                 control="resolutionList"/>
-        </hbox>
-        <menulist id="resolutionList" flex="1">
-          <menupopup/>
-        </menulist>
-      </row>
-
-      <row id="colorspaceGroup">
-        <hbox align="center" pack="end">
-          <label id="colorspaceLabel"
-                 value="&colorspaceInput.label;"
-                 accesskey="&colorspaceInput.accesskey;"
-                 control="colorspaceList"/>
-        </hbox>
-        <menulist id="colorspaceList" flex="1">
-          <menupopup/>
-        </menulist>
-      </row>
-
       <row id="colorGroup">
         <hbox align="center" pack="end">
           <label control="colorRadioGroup" value="&colorGroup.label;"/>
         </hbox>
         <radiogroup id="colorRadioGroup" orient="horizontal">
           <radio id="grayRadio"
                  label="&grayRadio.label;"
                  accesskey="&grayRadio.accesskey;"/>
           <radio id="colorRadio"
                  label="&colorRadio.label;"
                  accesskey="&colorRadio.accesskey;"/>
         </radiogroup>
       </row>
-
-      <row id="fontsGroup">
-        <hbox align="center" pack="end">
-          <label value="&fontsGroup.label;"/>
-        </hbox>
-        <checkbox id="downloadFonts"
-                  label="&downloadFonts.label;"
-                  accesskey="&downloadFonts.accesskey;"/>
-      </row>
     </rows>
   </grid>
 
   <grid>
     <columns>
       <column/>
     </columns>
     <rows>
--- a/toolkit/locales/en-US/chrome/global/printjoboptions.dtd
+++ b/toolkit/locales/en-US/chrome/global/printjoboptions.dtd
@@ -4,38 +4,25 @@
 
 <!-- extracted from printjoboptions.xul -->
 
 <!ENTITY printJobOptions.title "Printer Properties">
 
 <!ENTITY paperInput.label "Paper Size:">
 <!ENTITY paperInput.accesskey "P">
 
-<!ENTITY plexInput.label "Plex mode:">
-<!ENTITY plexInput.accesskey "m">
-
-<!ENTITY resolutionInput.label "Resolution/Quality:">
-<!ENTITY resolutionInput.accesskey "e">
-
 <!ENTITY jobTitleInput.label "Job Title:">
 <!ENTITY jobTitleInput.accesskey "J">
 
 <!ENTITY colorGroup.label "Color:">
 <!ENTITY grayRadio.label "Grayscale">
 <!ENTITY grayRadio.accesskey "G">
 <!ENTITY colorRadio.label "Color">
 <!ENTITY colorRadio.accesskey "C">
 
-<!ENTITY colorspaceInput.label "Colorspace:">
-<!ENTITY colorspaceInput.accesskey "s">
-
-<!ENTITY fontsGroup.label "Fonts:">
-<!ENTITY downloadFonts.label "Download fonts to printer">
-<!ENTITY downloadFonts.accesskey "D">
-
 <!ENTITY edgeMarginInput.label "Gap from edge of paper to Margin">
 <!ENTITY topInput.label "Top:">
 <!ENTITY topInput.accesskey "T">
 <!ENTITY bottomInput.label "Bottom:">
 <!ENTITY bottomInput.accesskey "B">
 <!ENTITY leftInput.label "Left:">
 <!ENTITY leftInput.accesskey "L">
 <!ENTITY rightInput.label "Right:">
--- a/widget/gtk/nsDeviceContextSpecG.cpp
+++ b/widget/gtk/nsDeviceContextSpecG.cpp
@@ -432,28 +432,16 @@ NS_IMETHODIMP nsPrinterEnumeratorGTK::In
   else
     filename.AssignLiteral("mozilla.pdf");
 
   DO_PR_DEBUG_LOG(("Setting default filename to '%s'\n", filename.get()));
   aPrintSettings->SetToFileName(NS_ConvertUTF8toUTF16(filename).get());
 
   aPrintSettings->SetIsInitializedFromPrinter(true);
 
-  /* PostScript module does not support changing the plex mode... */
-  DO_PR_DEBUG_LOG(("setting default plex to '%s'\n", "default"));
-  aPrintSettings->SetPlexName(MOZ_UTF16("default"));
-
-  /* PostScript module does not support changing the resolution mode... */
-  DO_PR_DEBUG_LOG(("setting default resolution to '%s'\n", "default"));
-  aPrintSettings->SetResolutionName(MOZ_UTF16("default"));
-
-  /* PostScript module does not support changing the colorspace... */
-  DO_PR_DEBUG_LOG(("setting default colorspace to '%s'\n", "default"));
-  aPrintSettings->SetColorspace(MOZ_UTF16("default"));
-
   return NS_OK;    
 }
 
 NS_IMETHODIMP nsPrinterEnumeratorGTK::DisplayPropertiesDlg(const char16_t *aPrinter, nsIPrintSettings *aPrintSettings)
 {
   return NS_OK;
 }
 
--- a/widget/nsIPrintSettings.idl
+++ b/widget/nsIPrintSettings.idl
@@ -17,17 +17,17 @@
   [ref] native nsNativeIntMarginRef(nsIntMargin);
   [ref] native IntegerArray(nsTArray<int32_t>);
   
 interface nsIPrintSession;
 
 /**
  * Simplified graphics interface for JS rendering.
  */
-[scriptable, uuid(ec3d43bb-3fe0-4f9a-9502-eebcc511555b)]
+[scriptable, uuid(04dd3a01-a74e-44aa-8d49-2c30478fd7b8)]
 
 interface nsIPrintSettings : nsISupports
 {
   /**
    * PrintSettings to be Saved Navigation Constants
    */
   const unsigned long kInitSaveOddEvenPages   = 0x00000001;
   const unsigned long kInitSaveHeaderLeft     = 0x00000002;
@@ -51,22 +51,20 @@ interface nsIPrintSettings : nsISupports
   const unsigned long kInitSaveOrientation    = 0x00040000;
 
   const unsigned long kInitSavePrinterName    = 0x00100000;
   const unsigned long kInitSavePrintToFile    = 0x00200000;
   const unsigned long kInitSaveToFileName     = 0x00400000;
   const unsigned long kInitSavePageDelay      = 0x00800000;
   const unsigned long kInitSaveMargins        = 0x01000000;
   const unsigned long kInitSaveNativeData     = 0x02000000;
-  const unsigned long kInitSavePlexName       = 0x04000000;
+
   const unsigned long kInitSaveShrinkToFit    = 0x08000000;
   const unsigned long kInitSaveScaling        = 0x10000000;
-  const unsigned long kInitSaveColorspace     = 0x20000000;
-  const unsigned long kInitSaveResolutionName = 0x40000000;
-  const unsigned long kInitSaveDownloadFonts  = 0x80000000;
+
   const unsigned long kInitSaveAll            = 0xFFFFFFFF;
 
   /* Print Option Flags for Bit Field*/
   const long kPrintOddPages     = 0x00000001;
   const long kPrintEvenPages    = 0x00000002;
   const long kEnableSelectionRB = 0x00000004;
 
   /* Print Range Enums */
@@ -226,25 +224,16 @@ interface nsIPrintSettings : nsISupports
   /* Additional XP Related */
   attribute wstring paperName;     /* name of paper */
   attribute short   paperSizeType; /* use native data or is defined here */
   attribute short   paperData;     /* native data value */
   attribute double  paperWidth;    /* width of the paper in inches or mm */
   attribute double  paperHeight;   /* height of the paper in inches or mm */
   attribute short   paperSizeUnit; /* paper is in inches or mm */
 
-  attribute wstring plexName;      /* name of plex mode (like "simplex", "duplex",
-                                    * "tumble" and various custom values) */
-
-  attribute wstring colorspace;    /* device-specific name of colorspace, overrides |printInColor| */
-  attribute wstring resolutionName;/* device-specific identifer of resolution or quality
-                                    * (like "600", "600x300", "600x300x12", "high-res",
-                                    * "med-res". "low-res", etc.) */
-  attribute boolean downloadFonts; /* enable font download to printer? */
-
   attribute boolean printReversed;
   attribute boolean printInColor;  /* a false means grayscale */
   attribute long    orientation;   /*  see orientation consts */
   attribute long    numCopies;
 
   attribute wstring printerName;   /* name of destination printer */
 
   attribute boolean printToFile;
--- a/widget/nsPrintOptionsImpl.cpp
+++ b/widget/nsPrintOptionsImpl.cpp
@@ -54,25 +54,21 @@ static const char kPrintHeaderStrRight[]
 static const char kPrintFooterStrLeft[]   = "print_footerleft";
 static const char kPrintFooterStrCenter[] = "print_footercenter";
 static const char kPrintFooterStrRight[]  = "print_footerright";
 
 // Additional Prefs
 static const char kPrintReversed[]      = "print_reversed";
 static const char kPrintInColor[]       = "print_in_color";
 static const char kPrintPaperName[]     = "print_paper_name";
-static const char kPrintPlexName[]      = "print_plex_name";
 static const char kPrintPaperSizeType[] = "print_paper_size_type";
 static const char kPrintPaperData[]     = "print_paper_data";
 static const char kPrintPaperSizeUnit[] = "print_paper_size_unit";
 static const char kPrintPaperWidth[]    = "print_paper_width";
 static const char kPrintPaperHeight[]   = "print_paper_height";
-static const char kPrintColorspace[]    = "print_colorspace";
-static const char kPrintResolutionName[]= "print_resolution_name";
-static const char kPrintDownloadFonts[] = "print_downloadfonts";
 static const char kPrintOrientation[]   = "print_orientation";
 static const char kPrinterName[]        = "print_printer";
 static const char kPrintToFile[]        = "print_to_file";
 static const char kPrintToFileName[]    = "print_to_filename";
 static const char kPrintPageDelay[]     = "print_page_delay";
 static const char kPrintBGColors[]      = "print_bgcolor";
 static const char kPrintBGImages[]      = "print_bgimages";
 static const char kPrintShrinkToFit[]   = "print_shrink_to_fit";
@@ -176,29 +172,16 @@ nsPrintOptions::SerializeToPrintData(nsI
   data->paperName() = paperName;
 
   aSettings->GetPaperSizeType(&data->paperSizeType());
   aSettings->GetPaperData(&data->paperData());
   aSettings->GetPaperWidth(&data->paperWidth());
   aSettings->GetPaperHeight(&data->paperHeight());
   aSettings->GetPaperSizeUnit(&data->paperSizeUnit());
 
-  nsXPIDLString plexName;
-  aSettings->GetPlexName(getter_Copies(plexName));
-  data->plexName() = plexName;
-
-  nsXPIDLString colorspace;
-  aSettings->GetColorspace(getter_Copies(colorspace));
-  data->colorspace() = colorspace;
-
-  nsXPIDLString resolutionName;
-  aSettings->GetResolutionName(getter_Copies(resolutionName));
-  data->resolutionName() = resolutionName;
-
-  aSettings->GetDownloadFonts(&data->downloadFonts());
   aSettings->GetPrintReversed(&data->printReversed());
   aSettings->GetPrintInColor(&data->printInColor());
   aSettings->GetOrientation(&data->orientation());
 
   aSettings->GetNumCopies(&data->numCopies());
 
   nsXPIDLString printerName;
   aSettings->GetPrinterName(getter_Copies(printerName));
@@ -298,23 +281,16 @@ nsPrintOptions::DeserializeToPrintSettin
   settings->SetPaperName(data.paperName().get());
 
   settings->SetPaperSizeType(data.paperSizeType());
   settings->SetPaperData(data.paperData());
   settings->SetPaperWidth(data.paperWidth());
   settings->SetPaperHeight(data.paperHeight());
   settings->SetPaperSizeUnit(data.paperSizeUnit());
 
-  settings->SetPlexName(data.plexName().get());
-
-  settings->SetColorspace(data.colorspace().get());
-
-  settings->SetResolutionName(data.resolutionName().get());
-
-  settings->SetDownloadFonts(data.downloadFonts());
   settings->SetPrintReversed(data.printReversed());
   settings->SetPrintInColor(data.printInColor());
   settings->SetOrientation(data.orientation());
 
   settings->SetNumCopies(data.numCopies());
 
   settings->SetPrinterName(data.printerName().get());
 
@@ -645,51 +621,23 @@ nsPrintOptions::ReadPrefs(nsIPrintSettin
 
   if (aFlags & nsIPrintSettings::kInitSaveInColor) {
     if (GETBOOLPREF(kPrintInColor, &b)) {
       aPS->SetPrintInColor(b);
       DUMP_BOOL(kReadStr, kPrintInColor, b);
     }
   }
 
-  if (aFlags & nsIPrintSettings::kInitSavePlexName) {
-    if (GETSTRPREF(kPrintPlexName, &str)) {
-      aPS->SetPlexName(str.get());
-      DUMP_STR(kReadStr, kPrintPlexName, str.get());
-    }
-  }
-
   if (aFlags & nsIPrintSettings::kInitSavePaperData) {
     if (GETINTPREF(kPrintPaperData, &iVal)) {
       aPS->SetPaperData(iVal);
       DUMP_INT(kReadStr, kPrintPaperData, iVal);
     }
   }
 
-  if (aFlags & nsIPrintSettings::kInitSaveColorspace) {
-    if (GETSTRPREF(kPrintColorspace, &str)) {
-      aPS->SetColorspace(str.get());
-      DUMP_STR(kReadStr, kPrintColorspace, str.get());
-    }
-  }
-
-  if (aFlags & nsIPrintSettings::kInitSaveResolutionName) {
-    if (GETSTRPREF(kPrintResolutionName, &str)) {
-      aPS->SetResolutionName(str.get());
-      DUMP_STR(kReadStr, kPrintResolutionName, str.get());
-    }
-  }
-
-  if (aFlags & nsIPrintSettings::kInitSaveDownloadFonts) {
-    if (GETBOOLPREF(kPrintDownloadFonts, &b)) {
-      aPS->SetDownloadFonts(b);
-      DUMP_BOOL(kReadStr, kPrintDownloadFonts, b);
-    }
-  }
-
   if (aFlags & nsIPrintSettings::kInitSaveOrientation) {
     if (GETINTPREF(kPrintOrientation, &iVal)) {
       aPS->SetOrientation(iVal);
       DUMP_INT(kReadStr, kPrintOrientation, iVal);
     }
   }
 
   if (aFlags & nsIPrintSettings::kInitSavePrintToFile) {
@@ -937,53 +885,24 @@ nsPrintOptions::WritePrefs(nsIPrintSetti
 
   if (aFlags & nsIPrintSettings::kInitSaveInColor) {
     if (NS_SUCCEEDED(aPS->GetPrintInColor(&b))) {
       DUMP_BOOL(kWriteStr, kPrintInColor, b);
       Preferences::SetBool(GetPrefName(kPrintInColor, aPrinterName), b);
     }
   }
 
-  if (aFlags & nsIPrintSettings::kInitSavePlexName) {
-    if (NS_SUCCEEDED(aPS->GetPlexName(&uStr))) {
-      DUMP_STR(kWriteStr, kPrintPlexName, uStr);
-      Preferences::SetString(GetPrefName(kPrintPlexName, aPrinterName), uStr);
-    }
-  }
-
   if (aFlags & nsIPrintSettings::kInitSavePaperData) {
     if (NS_SUCCEEDED(aPS->GetPaperData(&iVal16))) {
       DUMP_INT(kWriteStr, kPrintPaperData, iVal16);
       Preferences::SetInt(GetPrefName(kPrintPaperData, aPrinterName),
                           int32_t(iVal16));
     }
   }
 
-  if (aFlags & nsIPrintSettings::kInitSaveColorspace) {
-    if (NS_SUCCEEDED(aPS->GetColorspace(&uStr))) {
-      DUMP_STR(kWriteStr, kPrintColorspace, uStr);
-      Preferences::SetString(GetPrefName(kPrintColorspace, aPrinterName), uStr);
-    }
-  }
-
-  if (aFlags & nsIPrintSettings::kInitSaveResolutionName) {
-    if (NS_SUCCEEDED(aPS->GetResolutionName(&uStr))) {
-      DUMP_STR(kWriteStr, kPrintResolutionName, uStr);
-      Preferences::SetString(GetPrefName(kPrintResolutionName, aPrinterName),
-                             uStr);
-    }
-  }
-
-  if (aFlags & nsIPrintSettings::kInitSaveDownloadFonts) {
-    if (NS_SUCCEEDED(aPS->GetDownloadFonts(&b))) {
-      DUMP_BOOL(kWriteStr, kPrintDownloadFonts, b);
-      Preferences::SetBool(GetPrefName(kPrintDownloadFonts, aPrinterName), b);
-    }
-  }
-
   if (aFlags & nsIPrintSettings::kInitSaveOrientation) {
     if (NS_SUCCEEDED(aPS->GetOrientation(&iVal))) {
       DUMP_INT(kWriteStr, kPrintOrientation, iVal);
       Preferences::SetInt(GetPrefName(kPrintOrientation, aPrinterName), iVal);
     }
   }
 
   // Only the general version of this pref is saved
@@ -1476,17 +1395,16 @@ Tester::Tester()
     ps->SetPrintRange(15);
     ps->SetHeaderStrLeft(NS_ConvertUTF8toUTF16("Left").get());
     ps->SetHeaderStrCenter(NS_ConvertUTF8toUTF16("Center").get());
     ps->SetHeaderStrRight(NS_ConvertUTF8toUTF16("Right").get());
     ps->SetFooterStrLeft(NS_ConvertUTF8toUTF16("Left").get());
     ps->SetFooterStrCenter(NS_ConvertUTF8toUTF16("Center").get());
     ps->SetFooterStrRight(NS_ConvertUTF8toUTF16("Right").get());
     ps->SetPaperName(NS_ConvertUTF8toUTF16("Paper Name").get());
-    ps->SetPlexName(NS_ConvertUTF8toUTF16("Plex Name").get());
     ps->SetPaperSizeType(10);
     ps->SetPaperData(1);
     ps->SetPaperWidth(100.0);
     ps->SetPaperHeight(50.0);
     ps->SetPaperSizeUnit(nsIPrintSettings::kPaperSizeMillimeters);
     ps->SetPrintReversed(true);
     ps->SetPrintInColor(true);
     ps->SetOrientation(nsIPrintSettings::kLandscapeOrientation);
@@ -1508,23 +1426,19 @@ Tester::Tester()
       {kPrintHeaderStrRight, nsIPrintSettings::kInitSaveHeaderRight},
       {kPrintFooterStrLeft, nsIPrintSettings::kInitSaveFooterLeft},
       {kPrintFooterStrCenter, nsIPrintSettings::kInitSaveFooterCenter},
       {kPrintFooterStrRight, nsIPrintSettings::kInitSaveFooterRight},
       {kPrintBGColors, nsIPrintSettings::kInitSaveBGColors},
       {kPrintBGImages, nsIPrintSettings::kInitSaveBGImages},
       {kPrintShrinkToFit, nsIPrintSettings::kInitSaveShrinkToFit},
       {kPrintPaperSize, nsIPrintSettings::kInitSavePaperSize},
-      {kPrintPlexName, nsIPrintSettings::kInitSavePlexName},
       {kPrintPaperData, nsIPrintSettings::kInitSavePaperData},
       {kPrintReversed, nsIPrintSettings::kInitSaveReversed},
       {kPrintInColor, nsIPrintSettings::kInitSaveInColor},
-      {kPrintColorspace, nsIPrintSettings::kInitSaveColorspace},
-      {kPrintResolutionName, nsIPrintSettings::kInitSaveResolutionName},
-      {kPrintDownloadFonts, nsIPrintSettings::kInitSaveDownloadFonts},
       {kPrintOrientation, nsIPrintSettings::kInitSaveOrientation},
       {kPrinterName, nsIPrintSettings::kInitSavePrinterName},
       {kPrintToFile, nsIPrintSettings::kInitSavePrintToFile},
       {kPrintToFileName, nsIPrintSettings::kInitSaveToFileName},
       {kPrintPageDelay, nsIPrintSettings::kInitSavePageDelay},
       {"Margins", nsIPrintSettings::kInitSaveMargins},
       {"All", nsIPrintSettings::kInitSaveAll},
       {nullptr, 0}};
--- a/widget/nsPrintSettingsImpl.cpp
+++ b/widget/nsPrintSettingsImpl.cpp
@@ -36,17 +36,16 @@ nsPrintSettings::nsPrintSettings() :
   mPaperData(0),
   mPaperSizeType(kPaperSizeDefined),
   mPaperWidth(8.5),
   mPaperHeight(11.0),
   mPaperSizeUnit(kPaperSizeInches),
   mPrintReversed(false),
   mPrintInColor(true),
   mOrientation(kPortraitOrientation),
-  mDownloadFonts(false),
   mNumCopies(1),
   mPrintToFile(false),
   mOutputFormat(kOutputFormatNative),
   mIsInitedFromPrinter(false),
   mIsInitedFromPrefs(false),
   mPersistMarginBoxSettings(true)
 {
 
@@ -172,58 +171,16 @@ NS_IMETHODIMP nsPrintSettings::GetOrient
   return NS_OK;
 }
 NS_IMETHODIMP nsPrintSettings::SetOrientation(int32_t aOrientation)
 {
   mOrientation = aOrientation;
   return NS_OK;
 }
 
-/* attribute wstring colorspace; */
-NS_IMETHODIMP nsPrintSettings::GetColorspace(char16_t * *aColorspace)
-{
-  NS_ENSURE_ARG_POINTER(aColorspace);
-  if (!mColorspace.IsEmpty()) {
-    *aColorspace = ToNewUnicode(mColorspace);
-  } else {
-    *aColorspace = nullptr;
-  }
-  return NS_OK;
-}
-NS_IMETHODIMP nsPrintSettings::SetColorspace(const char16_t * aColorspace)
-{
-  if (aColorspace) {
-    mColorspace = aColorspace;
-  } else {
-    mColorspace.SetLength(0);
-  }
-  return NS_OK;
-}
-
-/* attribute wstring resolutionname; */
-NS_IMETHODIMP nsPrintSettings::GetResolutionName(char16_t * *aResolutionName)
-{
-  NS_ENSURE_ARG_POINTER(aResolutionName);
-  if (!mResolutionName.IsEmpty()) {
-    *aResolutionName = ToNewUnicode(mResolutionName);
-  } else {
-    *aResolutionName = nullptr;
-  }
-  return NS_OK;
-}
-NS_IMETHODIMP nsPrintSettings::SetResolutionName(const char16_t * aResolutionName)
-{
-  if (aResolutionName) {
-    mResolutionName = aResolutionName;
-  } else {
-    mResolutionName.SetLength(0);
-  }
-  return NS_OK;
-}
-
 /* attribute wstring resolution; */
 NS_IMETHODIMP nsPrintSettings::GetResolution(int32_t *aResolution)
 {
   NS_ENSURE_ARG_POINTER(aResolution);
   *aResolution = mResolution;
   return NS_OK;
 }
 NS_IMETHODIMP nsPrintSettings::SetResolution(const int32_t aResolution)
@@ -240,29 +197,16 @@ NS_IMETHODIMP nsPrintSettings::GetDuplex
   return NS_OK;
 }
 NS_IMETHODIMP nsPrintSettings::SetDuplex(const int32_t aDuplex)
 {
   mDuplex = aDuplex;
   return NS_OK;
 }
 
-/* attribute boolean downloadFonts; */
-NS_IMETHODIMP nsPrintSettings::GetDownloadFonts(bool *aDownloadFonts)
-{
-  //NS_ENSURE_ARG_POINTER(aDownloadFonts);
-  *aDownloadFonts = mDownloadFonts;
-  return NS_OK;
-}
-NS_IMETHODIMP nsPrintSettings::SetDownloadFonts(bool aDownloadFonts)
-{
-  mDownloadFonts = aDownloadFonts;
-  return NS_OK;
-}
-
 /* attribute wstring printer; */
 NS_IMETHODIMP nsPrintSettings::GetPrinterName(char16_t * *aPrinter)
 {
    NS_ENSURE_ARG_POINTER(aPrinter);
 
    *aPrinter = ToNewUnicode(mPrinter);
    NS_ENSURE_TRUE(*aPrinter, NS_ERROR_OUT_OF_MEMORY);
 
@@ -879,37 +823,16 @@ NS_IMETHODIMP nsPrintSettings::SetPaperN
   if (aPaperName) {
     mPaperName = aPaperName;
   } else {
     mPaperName.SetLength(0);
   }
   return NS_OK;
 }
 
-/* attribute wstring plexName; */
-NS_IMETHODIMP nsPrintSettings::GetPlexName(char16_t * *aPlexName)
-{
-  NS_ENSURE_ARG_POINTER(aPlexName);
-  if (!mPlexName.IsEmpty()) {
-    *aPlexName = ToNewUnicode(mPlexName);
-  } else {
-    *aPlexName = nullptr;
-  }
-  return NS_OK;
-}
-NS_IMETHODIMP nsPrintSettings::SetPlexName(const char16_t * aPlexName)
-{
-  if (aPlexName) {
-    mPlexName = aPlexName;
-  } else {
-    mPlexName.SetLength(0);
-  }
-  return NS_OK;
-}
-
 /* attribute boolean howToEnableFrameUI; */
 NS_IMETHODIMP nsPrintSettings::GetHowToEnableFrameUI(int16_t *aHowToEnableFrameUI)
 {
   NS_ENSURE_ARG_POINTER(aHowToEnableFrameUI);
   *aHowToEnableFrameUI = mHowToEnableFrameUI;
   return NS_OK;
 }
 NS_IMETHODIMP nsPrintSettings::SetHowToEnableFrameUI(int16_t aHowToEnableFrameUI)
@@ -1152,17 +1075,16 @@ nsPrintSettings& nsPrintSettings::operat
   mHowToEnableFrameUI  = rhs.mHowToEnableFrameUI;
   mIsCancelled         = rhs.mIsCancelled;
   mPrintFrameTypeUsage = rhs.mPrintFrameTypeUsage;
   mPrintFrameType      = rhs.mPrintFrameType;
   mPrintSilent         = rhs.mPrintSilent;
   mShrinkToFit         = rhs.mShrinkToFit;
   mShowPrintProgress   = rhs.mShowPrintProgress;
   mPaperName           = rhs.mPaperName;
-  mPlexName            = rhs.mPlexName;
   mPaperSizeType       = rhs.mPaperSizeType;
   mPaperData           = rhs.mPaperData;
   mPaperWidth          = rhs.mPaperWidth;
   mPaperHeight         = rhs.mPaperHeight;
   mPaperSizeUnit       = rhs.mPaperSizeUnit;
   mPrintReversed       = rhs.mPrintReversed;
   mPrintInColor        = rhs.mPrintInColor;
   mOrientation         = rhs.mOrientation;
--- a/widget/nsPrintSettingsImpl.h
+++ b/widget/nsPrintSettingsImpl.h
@@ -76,31 +76,27 @@ protected:
 
   nsString      mTitle;
   nsString      mURL;
   nsString      mPageNumberFormat;
   nsString      mHeaderStrs[NUM_HEAD_FOOT];
   nsString      mFooterStrs[NUM_HEAD_FOOT];
 
   nsString      mPaperName;
-  nsString      mPlexName;
   int16_t       mPaperData;
   int16_t       mPaperSizeType;
   double        mPaperWidth;
   double        mPaperHeight;
   int16_t       mPaperSizeUnit;
 
   bool          mPrintReversed;
   bool          mPrintInColor; // a false means grayscale
   int32_t       mOrientation;  // see orientation consts
-  nsString      mColorspace;
-  nsString      mResolutionName;
   int32_t       mResolution;
   int32_t       mDuplex;
-  bool          mDownloadFonts;
   int32_t       mNumCopies;
   nsXPIDLString mPrinter;
   bool          mPrintToFile;
   nsString      mToFileName;
   int16_t       mOutputFormat;
   bool          mIsInitedFromPrinter;
   bool          mIsInitedFromPrefs;
   bool          mPersistMarginBoxSettings;