Merge 73229 - 2010-12-02 Mikhail Naganov <mnaganov@chromium.org>...

WebCore/inspector/front-end/HeapSnapshotView.js

Index: WebCore/inspector/front-end/HeapSnapshotView.js
===================================================================
--- WebCore/inspector/front-end/HeapSnapshotView.js	(revision 73362)
+++ WebCore/inspector/front-end/HeapSnapshotView.js	(working copy)
@@ -327,22 +327,16 @@
 
     _loadProfile: function(profile, callback)
     {
-        if (profile._loaded) {
-            callback(profile);
-            return;
-        }
+        WebInspector.panels.profiles.loadHeapSnapshot(profile.uid, callback);
+    },
 
-        InspectorBackend.getProfile(profile.typeId, profile.uid, loadedCallback.bind(this));
-
-        function loadedCallback(loadedSnapshot) {
-            profile.children = loadedSnapshot.head.children;
-            profile.entries = loadedSnapshot.head.entries;
-            profile.lowlevels = loadedSnapshot.head.lowlevels;
-            this._prepareProfile(profile);
-            profile._loaded = true;
-            this.parent.updateProfile(profile);
-            callback(profile);
-        }
+    processLoadedSnapshot: function(profile, loadedSnapshot)
+    {
+        var snapshot = WebInspector.HeapSnapshotView.prototype._convertSnapshot(loadedSnapshot);
+        profile.children = snapshot.children;
+        profile.entries = snapshot.entries;
+        profile.lowlevels = snapshot.lowlevels;
+        WebInspector.HeapSnapshotView.prototype._prepareProfile(profile);
     },
 
     _mouseDownInDataGrid: function(event)