Remove WebInspector.HeapSnapshotArraySlice

This is exact copy of r169554 with a fix for inpsector protocol tests.

Uin32Array already has subarray method that returns a new view for the same array buffer.

BUG=None
TBR=alph@chromium.org

Review URL: https://codereview.chromium.org/197533009

git-svn-id: svn://svn.chromium.org/blink/trunk@169639 bbb929c8-8fbe-4397-9dbb-9b2b20218538

third_party/WebKit/LayoutTests/inspector-protocol/heap-profiler/resources/heap-snapshot-common.js

@@ -34,6 +34,8 @@ InspectorTest.takeHeapSnapshot = function(callback)
     {
         var serializedSnapshot = chunks.join("");
         var parsed = JSON.parse(serializedSnapshot);
+        parsed.nodes = new Uint32Array(parsed.nodes);
+        parsed.edges = new Uint32Array(parsed.edges);
         var snapshot = new WebInspector.JSHeapSnapshot(parsed, new WebInspector.HeapSnapshotProgress());
         callback(snapshot);
         InspectorTest.log("SUCCESS: didGetHeapSnapshot");

third_party/WebKit/LayoutTests/inspector/profiler/heap-snapshot-test.js

@@ -29,23 +29,23 @@ InspectorTest.createJSHeapSnapshotMockObject = function()
         //       b\   v   /
         //         -> B (6) -bd- D (12)
         //
-        _nodes: [
+        _nodes: new Uint32Array([
             0, 0, 2,    //  0: root
             1, 1, 2,    //  3: A
             1, 2, 2,    //  6: B
             1, 3, 1,    //  9: C
             1, 4, 0,    // 12: D
-            1, 5, 0],   // 15: E
-        _containmentEdges: [
+            1, 5, 0]),  // 15: E
+        _containmentEdges: new Uint32Array([
             2,  6, 3,   //  0: shortcut 'a' to node 'A'
             1,  7, 6,   //  3: property 'b' to node 'B'
             0,  1, 6,   //  6: element '1' to node 'B'
             1,  8, 9,   //  9: property 'ac' to node 'C'
             1,  9, 9,   // 12: property 'bc' to node 'C'
             1, 10, 12,  // 15: property 'bd' to node 'D'
-            1, 11, 15], // 18: property 'ce' to node 'E'
+            1, 11, 15]),// 18: property 'ce' to node 'E'
         _strings: ["", "A", "B", "C", "D", "E", "a", "b", "ac", "bc", "bd", "ce"],
-        _firstEdgeIndexes: [0, 6, 12, 18, 21, 21, 21],
+        _firstEdgeIndexes: new Uint32Array([0, 6, 12, 18, 21, 21, 21]),
         createNode: WebInspector.JSHeapSnapshot.prototype.createNode,
         createEdge: WebInspector.JSHeapSnapshot.prototype.createEdge,
         createRetainingEdge: WebInspector.JSHeapSnapshot.prototype.createRetainingEdge
@@ -327,6 +327,12 @@ InspectorTest.HeapSnapshotBuilder.prototype = {
         return rawSnapshot;
     },
 
+    createJSHeapSnapshot: function()
+    {
+        var parsedSnapshot = InspectorTest._postprocessHeapSnapshotMock(this.generateSnapshot());
+        return new WebInspector.JSHeapSnapshot(parsedSnapshot, new WebInspector.HeapSnapshotProgress());
+    },
+
     _registerNode: function(node)
     {
         this._nodes.push(node);

third_party/WebKit/LayoutTests/inspector/profiler/heap-snapshot.html

@@ -164,7 +164,7 @@ function test()
                     node = newNode;
                 }
 
-                var snapshot = new WebInspector.JSHeapSnapshot(builder.generateSnapshot(), new WebInspector.HeapSnapshotProgress());
+                var snapshot = builder.createJSHeapSnapshot();
                 InspectorTest.assertEquals(
                     iterations * nodeSize, snapshot.rootNode().retainedSize(),
                     "Ensure that root node retained size supports values exceeding 2^32 bytes.");
@@ -205,7 +205,7 @@ function test()
                 var debuggerOwnedNode = new InspectorTest.HeapNode("debuggerOwnedNode");
                 debuggerNode.linkNode(debuggerOwnedNode, InspectorTest.HeapEdge.Type.element);
 
-                var snapshot = new WebInspector.JSHeapSnapshot(builder.generateSnapshot(), new WebInspector.HeapSnapshotProgress());
+                var snapshot = builder.createJSHeapSnapshot();
                 snapshot._flags = new Array(snapshot.nodeCount);
                 for (var i = 0; i < snapshot.nodeCount; ++i)
                     snapshot._flags[i] = 0;
@@ -299,11 +299,11 @@ function test()
                 var root = snapshot.rootNode();
                 var rawEdges = root.rawEdges();
                 InspectorTest.assertEquals(6, rawEdges.length);
-                InspectorTest.assertEquals(6, rawEdges.slice(0).length);
-                InspectorTest.assertEquals(3, rawEdges.slice(3).length);
-                InspectorTest.assertEquals(3, rawEdges.slice(3, 6).length);
-                InspectorTest.assertEquals(3, rawEdges.slice(0, 3).length);
-                InspectorTest.assertEquals(0, rawEdges.slice(3, 3).length);
+                InspectorTest.assertEquals(6, rawEdges.subarray(0).length);
+                InspectorTest.assertEquals(3, rawEdges.subarray(3).length);
+                InspectorTest.assertEquals(3, rawEdges.subarray(3, 6).length);
+                InspectorTest.assertEquals(3, rawEdges.subarray(0, 3).length);
+                InspectorTest.assertEquals(0, rawEdges.subarray(3, 3).length);
             },
 
             function heapSnapshotNodesProviderTest()

third_party/WebKit/Source/devtools/front_end/HeapSnapshot.js

@@ -30,42 +30,8 @@
 
 /**
  * @constructor
- * @param {!Uint32Array} array
- * @param {number} start
- * @param {number} end
- */
-WebInspector.HeapSnapshotArraySlice = function(array, start, end)
-{
-    this._array = array;
-    this._start = start;
-    this.length = end - start;
-}
-
-WebInspector.HeapSnapshotArraySlice.prototype = {
-    /**
-     * @param {number} index
-     * @return {number}
-     */
-    item: function(index)
-    {
-        return this._array[this._start + index];
-    },
-
-    /**
-     * @param {number} start
-     * @param {number=} end
-     * @return {!Uint32Array}
-     */
-    slice: function(start, end)
-    {
-        if (typeof end === "undefined")
-            end = this.length;
-        return this._array.subarray(this._start + start, this._start + end);
-    }
-}
-
-/**
- * @constructor
+ * @param {!WebInspector.HeapSnapshot} snapshot
+ * @param {!Uint32Array} edges
  * @param {number=} edgeIndex
  */
 WebInspector.HeapSnapshotEdge = function(snapshot, edges, edgeIndex)
@@ -129,15 +95,7 @@ WebInspector.HeapSnapshotEdge.prototype = {
      */
     nodeIndex: function()
     {
-        return this._edges.item(this.edgeIndex + this._snapshot._edgeToNodeOffset);
-    },
-
-    /**
-     * @return {!Array.<number>}
-     */
-    rawEdges: function()
-    {
-        return this._edges;
+        return this._edges[this.edgeIndex + this._snapshot._edgeToNodeOffset];
     },
 
     /**
@@ -167,7 +125,7 @@ WebInspector.HeapSnapshotEdge.prototype = {
 
     _type: function()
     {
-        return this._edges.item(this.edgeIndex + this._snapshot._edgeTypeOffset);
+        return this._edges[this.edgeIndex + this._snapshot._edgeTypeOffset];
     }
 };
 
@@ -523,11 +481,11 @@ WebInspector.HeapSnapshotNode.prototype = {
     },
 
     /**
-     * @return {!WebInspector.HeapSnapshotArraySlice}
+     * @return {!Uint32Array}
      */
     rawEdges: function()
     {
-        return new WebInspector.HeapSnapshotArraySlice(this._snapshot._containmentEdges, this._edgeIndexesStart(), this._edgeIndexesEnd());
+        return this._snapshot._containmentEdges.subarray(this._edgeIndexesStart(), this._edgeIndexesEnd());
     },
 
     /**
@@ -998,11 +956,15 @@ WebInspector.HeapSnapshot.prototype = {
         return this._firstDominatedNodeIndex[nodeIndex / this._nodeFieldCount];
     },
 
+    /**
+     * @param {!WebInspector.HeapSnapshotNode} node
+     * @return {!Uint32Array}
+     */
     _dominatedNodesOfNode: function(node)
     {
         var dominatedIndexFrom = this._getDominatedIndex(node.nodeIndex);
         var dominatedIndexTo = this._getDominatedIndex(node._nextNodeIndex());
-        return new WebInspector.HeapSnapshotArraySlice(this._dominatedNodes, dominatedIndexFrom, dominatedIndexTo);
+        return this._dominatedNodes.subarray(dominatedIndexFrom, dominatedIndexTo);
     },
 
     /**
@@ -1930,13 +1892,14 @@ WebInspector.HeapSnapshot.prototype = {
 
 /**
  * @constructor
- * @param {!Array.<number>=} unfilteredIterationOrder
+ * @param {(!Array.<number>|!Uint32Array)=} unfilteredIterationOrder
  */
 WebInspector.HeapSnapshotFilteredOrderedIterator = function(iterator, filter, unfilteredIterationOrder)
 {
     this._filter = filter;
     this._iterator = iterator;
     this._unfilteredIterationOrder = unfilteredIterationOrder;
+    /** @type {?Array.<number>|?Uint32Array} */
     this._iterationOrder = null;
     this._position = 0;
     this._currentComparator = null;
@@ -1950,7 +1913,7 @@ WebInspector.HeapSnapshotFilteredOrderedIterator.prototype = {
         if (this._iterationOrder)
             return;
         if (this._unfilteredIterationOrder && !this._filter) {
-            this._iterationOrder = this._unfilteredIterationOrder.slice(0);
+            this._iterationOrder = this._unfilteredIterationOrder;
             this._unfilteredIterationOrder = null;
             return;
         }
@@ -1965,8 +1928,7 @@ WebInspector.HeapSnapshotFilteredOrderedIterator.prototype = {
                     this._iterationOrder.push(iterator.index());
             }
         } else {
-            var order = this._unfilteredIterationOrder.constructor === Array ?
-                this._unfilteredIterationOrder : this._unfilteredIterationOrder.slice(0);
+            var order = this._unfilteredIterationOrder;
             for (var i = 0, l = order.length; i < l; ++i) {
                 iterator.setIndex(order[i]);
                 if (this._filter(iterator.item()))
@@ -2007,8 +1969,7 @@ WebInspector.HeapSnapshotFilteredOrderedIterator.prototype = {
                 if (this._filter(iterator.item()))
                     return false;
         } else {
-            var order = this._unfilteredIterationOrder.constructor === Array ?
-                this._unfilteredIterationOrder : this._unfilteredIterationOrder.slice(0);
+            var order = this._unfilteredIterationOrder;
             for (var i = 0, l = order.length; i < l; ++i) {
                 iterator.setIndex(order[i]);
                 if (this._filter(iterator.item()))
@@ -2178,7 +2139,7 @@ WebInspector.HeapSnapshotEdgesProvider.prototype = {
 /**
  * @constructor
  * @extends {WebInspector.HeapSnapshotFilteredOrderedIterator}
- * @param {!Array.<number>=} nodeIndexes
+ * @param {(!Array.<number>|!Uint32Array)=} nodeIndexes
  */
 WebInspector.HeapSnapshotNodesProvider = function(snapshot, filter, nodeIndexes)
 {

third_party/WebKit/Source/devtools/front_end/JSHeapSnapshot.js

@@ -58,7 +58,7 @@ WebInspector.JSHeapSnapshot.prototype = {
     },
 
     /**
-     * @param {!Array.<number>} edges
+     * @param {!Uint32Array} edges
      * @param {number} edgeIndex
      * @return {!WebInspector.JSHeapSnapshotEdge}
      */
@@ -147,7 +147,7 @@ WebInspector.JSHeapSnapshot.prototype = {
                     && globalObjEdge.node().isHidden()
                     && globalObjEdge._hasStringName()
                     && (globalObjEdge._nameOrIndex() in propNames))
-                    this._containmentEdges[globalObjEdge._edges._start + globalObjEdge.edgeIndex + this._edgeTypeOffset] = this._edgeInvisibleType;
+                    globalObjEdge._edges[globalObjEdge.edgeIndex + this._edgeTypeOffset] = this._edgeInvisibleType;
             }
         }
     },
@@ -666,7 +666,7 @@ WebInspector.JSHeapSnapshotNode.prototype = {
  * @constructor
  * @extends {WebInspector.HeapSnapshotEdge}
  * @param {!WebInspector.JSHeapSnapshot} snapshot
- * @param {!Array.<number>} edges
+ * @param {!Uint32Array} edges
  * @param {number=} edgeIndex
  */
 WebInspector.JSHeapSnapshotEdge = function(snapshot, edges, edgeIndex)
@@ -680,7 +680,8 @@ WebInspector.JSHeapSnapshotEdge.prototype = {
      */
     clone: function()
     {
-        return new WebInspector.JSHeapSnapshotEdge(this._snapshot, this._edges, this.edgeIndex);
+        var snapshot = /** @type {!WebInspector.JSHeapSnapshot} */ (this._snapshot);
+        return new WebInspector.JSHeapSnapshotEdge(snapshot, this._edges, this.edgeIndex);
     },
 
     /**
@@ -789,12 +790,12 @@ WebInspector.JSHeapSnapshotEdge.prototype = {
 
     _nameOrIndex: function()
     {
-        return this._edges.item(this.edgeIndex + this._snapshot._edgeNameOffset);
+        return this._edges[this.edgeIndex + this._snapshot._edgeNameOffset];
     },
 
     _type: function()
     {
-        return this._edges.item(this.edgeIndex + this._snapshot._edgeTypeOffset);
+        return this._edges[this.edgeIndex + this._snapshot._edgeTypeOffset];
     },
 
     __proto__: WebInspector.HeapSnapshotEdge.prototype