Changeset 141272 in webkit

Timestamp:

Jan 30, 2013 8:12:32 AM (11 years ago)

Author:

yurys@chromium.org

Message:

Web Inspector: remove NativeHeapGraph.js
​https://bugs.webkit.org/show_bug.cgi?id=108342

Reviewed by Pavel Feldman.

NativeHeapGraph.js was removed as NativeHeapSnapshot.js provides more
features and shares its implementation with JSHeapSnapshot.

• WebCore.gypi:
• WebCore.vcproj/WebCore.vcproj:
• inspector/compile-front-end.py:
• inspector/front-end/NativeHeapGraph.js: Removed.
• inspector/front-end/NativeMemorySnapshotView.js:

(WebInspector.NativeSnapshotProfileType.prototype.buttonClicked.didReceiveMemorySnapshot):
(WebInspector.NativeSnapshotProfileType.prototype.buttonClicked):
(WebInspector.NativeSnapshotProfileHeader.prototype.startSnapshotTransfer):

• inspector/front-end/ProfilesPanel.js:
• inspector/front-end/WebKit.qrc:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• WebCore.gypi (modified) (1 diff)
• WebCore.vcproj/WebCore.vcproj (modified) (1 diff)
• inspector/compile-front-end.py (modified) (1 diff)
• inspector/front-end/NativeHeapGraph.js (deleted)
• inspector/front-end/NativeMemorySnapshotView.js (modified) (3 diffs)
• inspector/front-end/ProfilesPanel.js (modified) (1 diff)
• inspector/front-end/WebKit.qrc (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-01-30  Yury Semikhatsky  <yurys@chromium.org>
+
+        Web Inspector: remove NativeHeapGraph.js
+        https://bugs.webkit.org/show_bug.cgi?id=108342
+
+        Reviewed by Pavel Feldman.
+
+        NativeHeapGraph.js was removed as NativeHeapSnapshot.js provides more
+        features and shares its implementation with JSHeapSnapshot.
+
+        * WebCore.gypi:
+        * WebCore.vcproj/WebCore.vcproj:
+        * inspector/compile-front-end.py:
+        * inspector/front-end/NativeHeapGraph.js: Removed.
+        * inspector/front-end/NativeMemorySnapshotView.js:
+        (WebInspector.NativeSnapshotProfileType.prototype.buttonClicked.didReceiveMemorySnapshot):
+        (WebInspector.NativeSnapshotProfileType.prototype.buttonClicked):
+        (WebInspector.NativeSnapshotProfileHeader.prototype.startSnapshotTransfer):
+        * inspector/front-end/ProfilesPanel.js:
+        * inspector/front-end/WebKit.qrc:
+
 2013-01-30  Vladislav Kaznacheev  <kaznacheev@chromium.org>
 

trunk/Source/WebCore/WebCore.gypi

@@ -5379 +5379 @@
             'inspector/front-end/HeapSnapshotWorkerDispatcher.js',
             'inspector/front-end/JSHeapSnapshot.js',
-            'inspector/front-end/NativeHeapGraph.js',
             'inspector/front-end/NativeHeapSnapshot.js',
             'inspector/front-end/NativeMemorySnapshotView.js',

trunk/Source/WebCore/WebCore.vcproj/WebCore.vcproj

@@ -77290 +77290 @@
                                 </File>
                                 <File
-                                        RelativePath="..\inspector\front-end\NativeHeapGraph.js"
-                                        >
-                                </File>
-                                <File
                                         RelativePath="..\inspector\front-end\NativeHeapSnapshot.js"
                                         >

trunk/Source/WebCore/inspector/compile-front-end.py

@@ -340 +340 @@
             "HeapSnapshotWorkerDispatcher.js",
             "JSHeapSnapshot.js",
-            "NativeHeapGraph.js",
             "NativeHeapSnapshot.js",
             "NativeMemorySnapshotView.js",

trunk/Source/WebCore/inspector/front-end/NativeMemorySnapshotView.js

@@ -272 +272 @@
         function didReceiveMemorySnapshot(error, memoryBlock, graph)
         {
-            profileHeader._graph = new WebInspector.NativeHeapGraph(graph);
+            profileHeader._graph = graph;
             profileHeader.isTemporary = false;
             profileHeader.sidebarElement.subtitle = Number.bytesToString(/** @type{number} */(memoryBlock.size));
@@ -339 +339 @@
     startSnapshotTransfer: function()
     {
-        setTimeout(this._takeNativeSnapshot.bind(this), 0);
+        var meta = {
+          "node_fields": [
+            "type",
+            "name",
+            "id",
+            "self_size",
+            "edge_count"
+          ],
+          "node_types": [
+            [
+              "hidden",
+              "array",
+              "string",
+              "object",
+              "code",
+              "closure",
+              "regexp",
+              "number",
+              "native",
+              "synthetic"
+            ],
+            "string",
+            "number",
+            "number",
+            "number",
+            "number",
+            "number"
+          ],
+          "edge_fields": [
+            "type",
+            "name_or_index",
+            "to_node"
+          ],
+          "edge_types": [
+            [
+              "context",
+              "element",
+              "property",
+              "internal",
+              "hidden",
+              "shortcut",
+              "weak"
+            ],
+            "string_or_number",
+            "node"
+          ]
+        };
+        var graph = this._graph;
+        var heapSnapshot = {
+            "snapshot": {
+                "meta": meta,
+                node_count: graph.nodes.length / 5,
+                edge_count: graph.edges.length / 3,
+                root_index: graph.nodes.length - 5
+            },
+            nodes: graph.nodes,
+            edges: graph.edges,
+            strings: graph.strings
+        };
+
+        var chunk = JSON.stringify(heapSnapshot);
+        this.transferChunk(chunk);
+        this.finishHeapSnapshot();
     },
 
@@ -345 +407 @@
     {
         return "NativeHeapSnapshot";
-    },
-
-    _takeNativeSnapshot: function()
-    {
-        /**
-         * @param {?string} error
-         * @param {?MemoryAgent.MemoryBlock} memoryBlock
-         * @param {?Object=} graph
-         */
-        function didReceiveMemorySnapshot(error, memoryBlock, graph)
-        {
-            var meta = {
-              "node_fields": [
-                "type",
-                "name",
-                "id",
-                "self_size",
-                "edge_count"
-              ],
-              "node_types": [
-                [
-                  "hidden",
-                  "array",
-                  "string",
-                  "object",
-                  "code",
-                  "closure",
-                  "regexp",
-                  "number",
-                  "native",
-                  "synthetic"
-                ],
-                "string",
-                "number",
-                "number",
-                "number",
-                "number",
-                "number"
-              ],
-              "edge_fields": [
-                "type",
-                "name_or_index",
-                "to_node"
-              ],
-              "edge_types": [
-                [
-                  "context",
-                  "element",
-                  "property",
-                  "internal",
-                  "hidden",
-                  "shortcut",
-                  "weak"
-                ],
-                "string_or_number",
-                "node"
-              ]
-            };
-            var heapSnapshot = {
-                "snapshot": {
-                    "meta": meta,
-                    node_count: graph.nodes.length / 5,
-                    edge_count: graph.edges.length / 3,
-                    root_index: graph.nodes.length - 5
-                },
-                nodes: graph.nodes,
-                edges: graph.edges,
-                strings: graph.strings
-            };
-
-            var chunk = JSON.stringify(heapSnapshot);
-            this.transferChunk(chunk);
-            this.finishHeapSnapshot();
-        }
-        MemoryAgent.getProcessMemoryDistribution(true, didReceiveMemorySnapshot.bind(this));
-
     },
 

trunk/Source/WebCore/inspector/front-end/ProfilesPanel.js

@@ -1415 +1415 @@
 importScript("HeapSnapshotWorkerDispatcher.js");
 importScript("JSHeapSnapshot.js");
-importScript("NativeHeapGraph.js");
 importScript("NativeHeapSnapshot.js");
 importScript("NativeMemorySnapshotView.js");

trunk/Source/WebCore/inspector/front-end/WebKit.qrc

@@ -114 +114 @@
     <file>MetricsSidebarPane.js</file>
     <file>NativeBreakpointsSidebarPane.js</file>
-    <file>NativeHeapGraph.js</file>
     <file>NativeHeapSnapshot.js</file>
     <file>NativeMemorySnapshotView.js</file>