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

WebCore/inspector/front-end/HeapSnapshotView.js

 /*
  * Copyright (C) 2010 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 309 matching lines @@
         return this._snapshotDataGridList;
     },
 
     _getProfiles: function()
     {
         return WebInspector.panels.profiles.getProfiles(WebInspector.HeapSnapshotProfileType.TypeId);
     },
 
     _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)
     {
         if (event.detail < 2)
             return;
 
         var cell = event.target.enclosingNodeOrSelfWithNodeName("td");
         if (!cell || (!cell.hasStyleClass("count-column") && !cell.hasStyleClass("size-column") && !cell.hasStyleClass("countDelta-column") && !cell.hasStyleClass("sizeDelta-column")))
             return;
@@ skipping 643 matching lines @@
         return new WebInspector.ProfileSidebarTreeElement(profile, WebInspector.UIString("Snapshot %d"), "heap-snapshot-sidebar-tree-item");
     },
 
     createView: function(profile)
     {
         return new WebInspector.HeapSnapshotView(WebInspector.panels.profiles, profile);
     }
 }
 
 WebInspector.HeapSnapshotProfileType.prototype.__proto__ = WebInspector.ProfileType.prototype;