[Devtools] Cleanup DataGrid's typecast and identifier naming

third_party/WebKit/Source/devtools/front_end/ui_lazy/SortableDataGrid.js

Index: third_party/WebKit/Source/devtools/front_end/ui_lazy/SortableDataGrid.js
diff --git a/third_party/WebKit/Source/devtools/front_end/ui_lazy/SortableDataGrid.js b/third_party/WebKit/Source/devtools/front_end/ui_lazy/SortableDataGrid.js
index d4c310cb72e02465a3a929ed1ab5a3cc45b46a45..d109767564296c490b9cd572572063444d38431a 100644
--- a/third_party/WebKit/Source/devtools/front_end/ui_lazy/SortableDataGrid.js
+++ b/third_party/WebKit/Source/devtools/front_end/ui_lazy/SortableDataGrid.js
@@ -5,7 +5,7 @@
 /**
  * @constructor
  * @extends {WebInspector.ViewportDataGrid}
- * @param {!Array.<!WebInspector.DataGrid.ColumnDescriptor>} columnsArray
+ * @param {!Array<!WebInspector.DataGrid.ColumnDescriptor>} columnsArray
  * @param {function(!WebInspector.DataGridNode, string, string, string)=} editCallback
  * @param {function(!WebInspector.DataGridNode)=} deleteCallback
  * @param {function()=} refreshCallback
@@ -33,30 +33,30 @@ WebInspector.SortableDataGrid.TrivialComparator = function(a, b)
 };
 
 /**
- * @param {string} columnIdentifier
+ * @param {string} columnId
  * @param {!WebInspector.DataGridNode} a
  * @param {!WebInspector.DataGridNode} b
  * @return {number}
  */
-WebInspector.SortableDataGrid.NumericComparator = function(columnIdentifier, a, b)
+WebInspector.SortableDataGrid.NumericComparator = function(columnId, a, b)
 {
-    var aValue = a.data[columnIdentifier];
-    var bValue = b.data[columnIdentifier];
+    var aValue = a.data[columnId];
+    var bValue = b.data[columnId];
     var aNumber = Number(aValue instanceof Node ? aValue.textContent : aValue);
     var bNumber = Number(bValue instanceof Node ? bValue.textContent : bValue);
     return aNumber < bNumber ? -1 : (aNumber > bNumber ? 1 : 0);
 };
 
 /**
- * @param {string} columnIdentifier
+ * @param {string} columnId
  * @param {!WebInspector.DataGridNode} a
  * @param {!WebInspector.DataGridNode} b
  * @return {number}
  */
-WebInspector.SortableDataGrid.StringComparator = function(columnIdentifier, a, b)
+WebInspector.SortableDataGrid.StringComparator = function(columnId, a, b)
 {
-    var aValue = a.data[columnIdentifier];
-    var bValue = b.data[columnIdentifier];
+    var aValue = a.data[columnId];
+    var bValue = b.data[columnId];
     var aString = aValue instanceof Node ? aValue.textContent : String(aValue);
     var bString = bValue instanceof Node ? bValue.textContent : String(bValue);
     return aString < bString ? -1 : (aString > bString ? 1 : 0);
@@ -85,9 +85,9 @@ WebInspector.SortableDataGrid.create = function(columnNames, values)
     if (!numColumns)
         return null;
 
-    var columns = [];
+    var columns = /** @type {!Array<!WebInspector.DataGrid.ColumnDescriptor>} */ ([]);
     for (var i = 0; i < columnNames.length; ++i)
-        columns.push({ title: columnNames[i], width: columnNames[i].length, sortable: true });
+        columns.push({ id: String(i), title: columnNames[i], width: columnNames[i].length, sortable: true });
 
     var nodes = [];
     for (var i = 0; i < values.length / numColumns; ++i) {
@@ -111,13 +111,13 @@ WebInspector.SortableDataGrid.create = function(columnNames, values)
     function sortDataGrid()
     {
         var nodes = dataGrid.rootNode().children;
-        var sortColumnIdentifier = dataGrid.sortColumnIdentifier();
-        if (!sortColumnIdentifier)
+        var sortColumnId = dataGrid.sortColumnId();
+        if (!sortColumnId)
             return;
 
         var columnIsNumeric = true;
         for (var i = 0; i < nodes.length; i++) {
-            var value = nodes[i].data[sortColumnIdentifier];
+            var value = nodes[i].data[sortColumnId];
             if (isNaN(value instanceof Node ? value.textContent : value)) {
                 columnIsNumeric = false;
                 break;
@@ -125,7 +125,7 @@ WebInspector.SortableDataGrid.create = function(columnNames, values)
         }
 
         var comparator = columnIsNumeric ? WebInspector.SortableDataGrid.NumericComparator : WebInspector.SortableDataGrid.StringComparator;
-        dataGrid.sortNodes(comparator.bind(null, sortColumnIdentifier), !dataGrid.isSortOrderAscending());
+        dataGrid.sortNodes(comparator.bind(null, sortColumnId), !dataGrid.isSortOrderAscending());
     }
     return dataGrid;
 };