bug 407956 - make nsITreeView not take a nsISupportsArray* r=neil, bz sr=neil

Author: Trevor Saunders

accessible/tests/mochitest/treeview.js

@@ -101,17 +101,16 @@ nsTreeView.prototype =
     var data = this.getDataForIndex(aRow);
     return data.value;
   },
-  getRowProperties: function getRowProperties(aIndex, aProperties) {},
-  getCellProperties: function getCellProperties(aIndex, aCol, aProperties)
+  getRowProperties: function getRowProperties(aIndex) { return ""; },
+  getCellProperties: function getCellProperties(aIndex, aCol)
   {
     if (!aCol.cycler)
-      return;
+      return "";
 
     var data = this.getDataForIndex(aIndex);
-    var atom = this.mCyclerStates[data.cyclerState];
-    aProperties.AppendElement(atom);
+    return this.mCyclerStates[data.cyclerState];
   },
-  getColumnProperties: function getColumnProperties(aCol, aProperties) {},
+  getColumnProperties: function getColumnProperties(aCol) { return ""; },
   getParentIndex: function getParentIndex(aRowIndex)
   {
     var info = this.getInfoByIndex(aRowIndex);
@@ -261,9 +260,9 @@ nsTreeView.prototype =
   },
 
   mCyclerStates: [
-    createAtom("cyclerState1"),
-    createAtom("cyclerState2"),
-    createAtom("cyclerState3")
+    "cyclerState1",
+    "cyclerState2",
+    "cyclerState3"
   ]
 };
 

browser/base/content/pageinfo/pageInfo.js

@@ -103,9 +103,9 @@ pageInfoTreeView.prototype = {
     this.sortcol = treecol.index;
   },
 
-  getRowProperties: function(row, prop) { },
-  getCellProperties: function(row, column, prop) { },
-  getColumnProperties: function(column, prop) { },
+  getRowProperties: function(row) { return ""; },
+  getCellProperties: function(row, column) { return ""; },
+  getColumnProperties: function(column) { return ""; },
   isContainer: function(index) { return false; },
   isContainerOpen: function(index) { return false; },
   isSeparator: function(index) { return false; },
@@ -151,21 +151,19 @@ const COPYCOL_IMAGE = COL_IMAGE_ADDRESS;
 var gMetaView = new pageInfoTreeView('metatree', COPYCOL_META_CONTENT);
 var gImageView = new pageInfoTreeView('imagetree', COPYCOL_IMAGE);
 
-var atomSvc = Components.classes["@mozilla.org/atom-service;1"]
-                        .getService(Components.interfaces.nsIAtomService);
-gImageView._ltrAtom = atomSvc.getAtom("ltr");
-gImageView._brokenAtom = atomSvc.getAtom("broken");
-
-gImageView.getCellProperties = function(row, col, props) {
+gImageView.getCellProperties = function(row, col) {
   var data = gImageView.data[row];
   var item = gImageView.data[row][COL_IMAGE_NODE];
+  var props = "";
   if (!checkProtocol(data) ||
       item instanceof HTMLEmbedElement ||
       (item instanceof HTMLObjectElement && !item.type.startsWith("image/")))
-    props.AppendElement(this._brokenAtom);
+    props += "broken";
 
   if (col.element.id == "image-address")
-    props.AppendElement(this._ltrAtom);
+    props += " ltr";
+
+  return props;
 };
 
 gImageView.getCellText = function(row, column) {

browser/base/content/sanitizeDialog.js

@@ -804,9 +804,6 @@ var gContiguousSelectionTreeHelper = {
    */
   _makeTreeView: function CSTH__makeTreeView(aProtoTreeView)
   {
-    var atomServ = Cc["@mozilla.org/atom-service;1"].
-                   getService(Ci.nsIAtomService);
-
     var view = aProtoTreeView;
     var that = this;
 
@@ -837,28 +834,29 @@ var gContiguousSelectionTreeHelper = {
 
     view._getCellProperties = view.getCellProperties;
     view.getCellProperties =
-      function CSTH_View_getCellProperties(aRow, aCol, aProps)
+      function CSTH_View_getCellProperties(aRow, aCol)
       {
         var grippyRow = that.getGrippyRow();
         if (aRow === grippyRow)
-          aProps.AppendElement(atomServ.getAtom("grippyRow"));
-        else if (aRow < grippyRow)
-          this._getCellProperties(aRow, aCol, aProps);
-        else
-          this._getCellProperties(aRow - 1, aCol, aProps);
+          return "grippyRow";
+        if (aRow < grippyRow)
+          return this._getCellProperties(aRow, aCol);
+
+        return this._getCellProperties(aRow - 1, aCol);
       };
 
     view._getRowProperties = view.getRowProperties;
     view.getRowProperties =
-      function CSTH_View_getRowProperties(aRow, aProps)
+      function CSTH_View_getRowProperties(aRow)
       {
         var grippyRow = that.getGrippyRow();
         if (aRow === grippyRow)
-          aProps.AppendElement(atomServ.getAtom("grippyRow"));
-        else if (aRow < grippyRow)
-          this._getRowProperties(aRow, aProps);
-        else
-          this._getRowProperties(aRow - 1, aProps);
+          return "grippyRow";
+
+        if (aRow < grippyRow)
+          return this._getRowProperties(aRow);
+
+        return this._getRowProperties(aRow - 1);
       };
 
     view._getCellText = view.getCellText;

browser/base/content/sync/quota.js

@@ -218,9 +218,9 @@ let gUsageTreeView = {
     return this._collections.length;
   },
 
-  getRowProperties: function(index, properties) {},
-  getCellProperties: function(row, col, properties) {},
-  getColumnProperties: function(col, properties) {},
+  getRowProperties: function(index) { return ""; },
+  getCellProperties: function(row, col) { return ""; },
+  getColumnProperties: function(col) { return ""; },
   isContainer: function(index) { return false; },
   isContainerOpen: function(index) { return false; },
   isContainerEmpty: function(index) { return false; },

browser/components/places/content/treeView.js

@@ -23,20 +23,6 @@ function PlacesTreeView(aFlatList, aOnOpenFlatContainer, aController) {
 PlacesTreeView.prototype = {
   get wrappedJSObject() this,
 
-  _makeAtom: function PTV__makeAtom(aString) {
-    return Cc["@mozilla.org/atom-service;1"].
-           getService(Ci.nsIAtomService).
-           getAtom(aString);
-  },
-
-  _atoms: [],
-  _getAtomFor: function PTV__getAtomFor(aName) {
-    if (!this._atoms[aName])
-      this._atoms[aName] = this._makeAtom(aName);
-
-    return this._atoms[aName];
-  },
-
   __dateService: null,
   get _dateService() {
     if (!this.__dateService) {
@@ -857,9 +843,8 @@ PlacesTreeView.prototype = {
         function (aStatus, aLivemark) {
           if (Components.isSuccessCode(aStatus)) {
             this._controller.cacheLivemarkInfo(aNode, aLivemark);
-            let properties = this._cellProperties.get(aNode, null);
-            if (properties)
-              properties.push(this._getAtomFor("livemark"));
+            let properties = this._cellProperties.get(aNode);
+            this._cellProperties.set(aNode, properties += " livemark ");
 
             // The livemark attribute is set as a cell property on the title cell.
             this._invalidateCellValue(aNode, this.COLUMN_TYPE_TITLE);
@@ -1134,57 +1119,58 @@ PlacesTreeView.prototype = {
   get selection() this._selection,
   set selection(val) this._selection = val,
 
-  getRowProperties: function() { },
+  getRowProperties: function() { return ""; },
 
   getCellProperties:
-  function PTV_getCellProperties(aRow, aColumn, aProperties) {
+  function PTV_getCellProperties(aRow, aColumn) {
     // for anonid-trees, we need to add the column-type manually
+    var props = "";
     let columnType = aColumn.element.getAttribute("anonid");
     if (columnType)
-      aProperties.AppendElement(this._getAtomFor(columnType));
+      props += columnType;
     else
       columnType = aColumn.id;
 
     // Set the "ltr" property on url cells
     if (columnType == "url")
-      aProperties.AppendElement(this._getAtomFor("ltr"));
+      props += " ltr";
 
     if (columnType != "title")
-      return;
+      return props;
 
     let node = this._getNodeForRow(aRow);
 
     if (this._cuttingNodes.has(node)) {
-      aProperties.AppendElement(this._getAtomFor("cutting"));
+      props += " cutting";
     }
 
-    let properties = this._cellProperties.get(node, null);
-    if (!properties) {
-      properties = [];
+    let properties = this._cellProperties.get(node);
+    if (properties === undefined) {
+      properties = "";
       let itemId = node.itemId;
       let nodeType = node.type;
       if (PlacesUtils.containerTypes.indexOf(nodeType) != -1) {
         if (nodeType == Ci.nsINavHistoryResultNode.RESULT_TYPE_QUERY) {
-          properties.push(this._getAtomFor("query"));
+          properties += " query";
           if (PlacesUtils.nodeIsTagQuery(node))
-            properties.push(this._getAtomFor("tagContainer"));
+            properties += " tagContainer";
           else if (PlacesUtils.nodeIsDay(node))
-            properties.push(this._getAtomFor("dayContainer"));
+            properties += " dayContainer";
           else if (PlacesUtils.nodeIsHost(node))
-            properties.push(this._getAtomFor("hostContainer"));
+            properties += " hostContainer";
         }
         else if (nodeType == Ci.nsINavHistoryResultNode.RESULT_TYPE_FOLDER ||
                  nodeType == Ci.nsINavHistoryResultNode.RESULT_TYPE_FOLDER_SHORTCUT) {
           if (this._controller.hasCachedLivemarkInfo(node)) {
-            properties.push(this._getAtomFor("livemark"));
+            properties += " livemark";
           }
           else {
             PlacesUtils.livemarks.getLivemark(
               { id: node.itemId },
               function (aStatus, aLivemark) {
                 if (Components.isSuccessCode(aStatus)) {
                   this._controller.cacheLivemarkInfo(node, aLivemark);
-                  properties.push(this._getAtomFor("livemark"));
+                  properties += " livemark";
                   // The livemark attribute is set as a cell property on the title cell.
                   this._invalidateCellValue(node, this.COLUMN_TYPE_TITLE);
                 }
@@ -1196,30 +1182,29 @@ PlacesTreeView.prototype = {
         if (itemId != -1) {
           let queryName = PlacesUIUtils.getLeftPaneQueryNameFromId(itemId);
           if (queryName)
-            properties.push(this._getAtomFor("OrganizerQuery_" + queryName));
+            properties += " OrganizerQuery_" + queryName;
         }
       }
       else if (nodeType == Ci.nsINavHistoryResultNode.RESULT_TYPE_SEPARATOR)
-        properties.push(this._getAtomFor("separator"));
+        properties += " separator";
       else if (PlacesUtils.nodeIsURI(node)) {
-        properties.push(this._getAtomFor(PlacesUIUtils.guessUrlSchemeForUI(node.uri)));
+        properties += " " + PlacesUIUtils.guessUrlSchemeForUI(node.uri);
 
         if (this._controller.hasCachedLivemarkInfo(node.parent)) {
-          properties.push(this._getAtomFor("livemarkItem"));
+          properties += " livemarkItem";
           if (node.accessCount) {
-            properties.push(this._getAtomFor("visited"));
+            properties += " visited";
           }
         }
       }
 
       this._cellProperties.set(node, properties);
     }
-    for (let property of properties) {
-      aProperties.AppendElement(property);
-    }
+
+    return props + " " + properties;
   },
 
-  getColumnProperties: function(aColumn, aProperties) { },
+  getColumnProperties: function(aColumn) { return ""; },
 
   isContainer: function PTV_isContainer(aRow) {
     // Only leaf nodes aren't listed in the rows array.

browser/components/places/tests/chrome/test_0_bug510634.xul

@@ -43,21 +43,7 @@
 
     SimpleTest.waitForExplicitFinish();
 
-    function createSupportsArray() {
-      return Cc["@mozilla.org/supports-array;1"].
-             createInstance(Ci.nsISupportsArray);
-    }
-
     // converts nsISupportsArray of atoms to a simple JS-strings array
-    function convertPropertiesToJSArray(aSupportsArray) {
-      var results = [];
-      var count = aSupportsArray.Count();
-      for (var i = 0; i < count; i++)
-        results.push(aSupportsArray.QueryElementAt(i, Ci.nsIAtom).toString());
-
-      return results;
-    }
-
     function runTest() {
       // We need to cache and restore this getter in order to simulate
       // Bug 510634
@@ -91,9 +77,7 @@
         function(aQueryName, aRow) {
           let found = false;
           for (let i = 0; i < tree.view.rowCount && !found; i++) {
-            let rowProperties = createSupportsArray();
-            tree.view.getCellProperties(i, titleColumn, rowProperties);
-            rowProperties = convertPropertiesToJSArray(rowProperties);
+            rowProperties = tree.view.getCellProperties(i, titleColumn).split(" ");
             found = rowProperties.indexOf("OrganizerQuery_" + aQueryName) != -1;
           }
           ok(found, "OrganizerQuery_" + aQueryName + " is set");

browser/components/preferences/cookies.js

@@ -307,9 +307,9 @@ var gCookiesWindow = {
     _selection: null,
     get selection () { return this._selection; },
     set selection (val) { this._selection = val; return val; },
-    getRowProperties: function (aIndex, aProperties) {},
-    getCellProperties: function (aIndex, aColumn, aProperties) {},
-    getColumnProperties: function (aColumn, aProperties) {},
+    getRowProperties: function (aIndex) { return ""; },
+    getCellProperties: function (aIndex, aColumn) { return ""; },
+    getColumnProperties: function (aColumn) { return ""; },
     isContainer: function (aIndex) {
       if (!this._filtered) {
         var item = this._getItemAtIndex(aIndex);

browser/components/preferences/permissions.js

@@ -46,11 +46,13 @@ var gPermissionManager = {
     getProgressMode: function(aRow, aColumn) {},
     getCellValue: function(aRow, aColumn) {},
     cycleHeader: function(column) {},
-    getRowProperties: function(row,prop){},
-    getColumnProperties: function(column,prop){},
-    getCellProperties: function(row,column,prop){
+    getRowProperties: function(row){ return ""; },
+    getColumnProperties: function(column){ return ""; },
+    getCellProperties: function(row,column){
       if (column.element.getAttribute("id") == "siteCol")
-        prop.AppendElement(this._ltrAtom);
+        return "ltr";
+
+      return "";
     }
   },
   
@@ -183,10 +185,6 @@ var gPermissionManager = {
     this._loadPermissions();
 
     urlField.focus();
-
-    this._ltrAtom = Components.classes["@mozilla.org/atom-service;1"]
-                              .getService(Components.interfaces.nsIAtomService)
-                              .getAtom("ltr");
   },
 
   uninit: function ()

browser/components/search/content/engineManager.js

@@ -463,9 +463,9 @@ EngineView.prototype = {
   },
 
   selection: null,
-  getRowProperties: function(index, properties) { },
-  getCellProperties: function(index, column, properties) { },
-  getColumnProperties: function(column, properties) { },
+  getRowProperties: function(index) { return ""; },
+  getCellProperties: function(index, column) { return ""; },
+  getColumnProperties: function(column) { return ""; },
   isContainer: function(index) { return false; },
   isContainerOpen: function(index) { return false; },
   isContainerEmpty: function(index) { return false; },