Merge 89666 - 2011-06-23 Mikhail Naganov <mnaganov@chromium.org>

Source/WebCore/inspector/front-end/DetailedHeapshotView.js

 /*
  * Copyright (C) 2011 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 402 matching lines @@
         WebInspector.PleaseWaitMessage.prototype.show(this.element, this.searchCancelled.bind(this, pathsCount));
 
         function pathFound(result)
         {
             if (result === null) {
                 WebInspector.PleaseWaitMessage.prototype.hide();
                 if (!this.children.length)
                     this.appendChild(new WebInspector.DataGridNode({path:WebInspector.UIString("Can't find any paths."), len:""}, false));
                 return;
             } else if (result !== false) {
+                if (WebInspector.HeapSnapshotGenericObjectNode.prototype.isDOMWindow(result.path))
+                    result.path = WebInspector.HeapSnapshotGenericObjectNode.prototype.shortenWindowURL(result.path, true);
                 if (this._prefix)
                     result.path = this._prefix + result.path;
                 var node = new WebInspector.DataGridNode(result, false);
                 node.route = result.route;
                 this.appendChild(node);
                 ++this._counter;
             }
             setTimeout(startSearching.bind(this), 0);
         }
 
@@ skipping 557 matching lines @@
     _changeRetainingPathsRoot: function(event)
     {
         if (!event)
             return;
         this.retainmentDataGrid.refresh();
     },
 
     _getHoverAnchor: function(target)
     {
         var span = target.enclosingNodeOrSelfWithNodeName("span");
-        if (!span || !span.hasStyleClass("console-formatted-string"))
+        if (!span)
             return;
         var row = target.enclosingNodeOrSelfWithNodeName("tr");
         if (!row)
             return;
         var gridNode = row._dataGridNode;
-        if (!gridNode.snapshotNodeIndex)
+        if (!gridNode.hasHoverMessage)
             return;
-        span.snapshotNodeIndex = gridNode.snapshotNodeIndex;
+        span.node = gridNode;
         return span;
     },
 
     get isTracingToWindowObjects()
     {
         return this.retainingPathsRoot.selectedIndex === 1;
     },
 
     get _isShowingAsPercent()
     {
         return this.showCountAsPercent && this.showShallowSizeAsPercent && this.showRetainedSizeAsPercent;
     },
 
     _percentClicked: function(event)
     {
         var currentState = this._isShowingAsPercent;
         this.showCountAsPercent = !currentState;
         this.showShallowSizeAsPercent = !currentState;
         this.showRetainedSizeAsPercent = !currentState;
         this.refreshShowAsPercents();
     },
 
     _showStringContentPopup: function(span)
     {
         var stringContentElement = document.createElement("span");
-        stringContentElement.className = "monospace console-formatted-string";
+        stringContentElement.className = "monospace";
         stringContentElement.style.whiteSpace = "pre";
 
         var popover = new WebInspector.Popover(stringContentElement);
-        function displayString(names)
+        function displayString(name, className)
         {
-            if (names.length > 0) {
-                stringContentElement.textContent = "\"" + names[0] + "\"";          
-                popover.show(span);
-            }
+            stringContentElement.textContent = name;
+            stringContentElement.className += " " + className;
+            popover.show(span);
         }
-        this.profileWrapper.nodeFieldValuesByIndex("name", [span.snapshotNodeIndex], displayString);
+        span.node.hoverMessage(displayString);
         return popover;
     },
 
     _helpClicked: function(event)
     {
         if (!this.helpPopover) {
             var refTypes = ["a:", "console-formatted-name", WebInspector.UIString("property"),
                             "0:", "console-formatted-name", WebInspector.UIString("element"),
                             "a:", "console-formatted-number", WebInspector.UIString("context var"),
                             "a:", "console-formatted-null", WebInspector.UIString("system prop")];
@@ skipping 149 matching lines @@
         return new WebInspector.ProfileSidebarTreeElement(profile, WebInspector.UIString("Snapshot %d"), "heap-snapshot-sidebar-tree-item");
     },
 
     createView: function(profile)
     {
         return new WebInspector.DetailedHeapshotView(WebInspector.panels.profiles, profile);
     }
 }
 
 WebInspector.DetailedHeapshotProfileType.prototype.__proto__ = WebInspector.ProfileType.prototype;