Changeset 62949 in webkit

Timestamp:

Jul 9, 2010 7:17:25 AM (14 years ago)

Author:

pfeldman@chromium.org

Message:

2010-07-09 Pavel Feldman <​pfeldman@chromium.org>

Reviewed by Yury Semikhatsky.

Web Inspector: do not show default tooltip when detailed network info is available.

​https://bugs.webkit.org/show_bug.cgi?id=41957

• English.lproj/localizedStrings.js:
• inspector/front-end/ResourcesPanel.js: (WebInspector.ResourcesPanel): (WebInspector.ResourcesPanel.prototype.reset): (WebInspector.ResourcesPanel.prototype.showResource): (WebInspector.ResourcesPanel.prototype._getPopoverAnchor): (WebInspector.ResourcesPanel.prototype._showPopover): (WebInspector.ResourceTimeCalculator.prototype.computeBarGraphLabels):

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• English.lproj/localizedStrings.js (modified) (previous)
• inspector/front-end/ResourcesPanel.js (modified) (9 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-07-09  Pavel Feldman  <pfeldman@chromium.org>
+
+        Reviewed by Yury Semikhatsky.
+
+        Web Inspector: do not show default tooltip when detailed network info is available.
+
+        https://bugs.webkit.org/show_bug.cgi?id=41957
+
+        * English.lproj/localizedStrings.js:
+        * inspector/front-end/ResourcesPanel.js:
+        (WebInspector.ResourcesPanel):
+        (WebInspector.ResourcesPanel.prototype.reset):
+        (WebInspector.ResourcesPanel.prototype.showResource):
+        (WebInspector.ResourcesPanel.prototype._getPopoverAnchor):
+        (WebInspector.ResourcesPanel.prototype._showPopover):
+        (WebInspector.ResourceTimeCalculator.prototype.computeBarGraphLabels):
+
 2010-07-09  François Sausset  <sausset@gmail.com>
 

trunk/WebCore/inspector/front-end/ResourcesPanel.js

@@ -42 +42 @@
 
     this._createStatusbarButtons();
+    this._popoverHelper = new WebInspector.PopoverHelper(this.element, this._getPopoverAnchor.bind(this), this._showPopover.bind(this), true);
 
     this.reset();
@@ -47 +48 @@
     this.graphsTreeElement.children[0].select();
     this._resourceTrackingEnabled = false;
-
-    this._popoverHelper = new WebInspector.PopoverHelper(this.element, this._getPopoverAnchor.bind(this), this._showPopover.bind(this), true);
 }
 
@@ -329 +328 @@
     reset: function()
     {
+        this._popoverHelper.hidePopup();
         this.closeVisibleResource();
 
@@ -477 +477 @@
             return;
 
+        this._popoverHelper.hidePopup();
+
         this.containerElement.addStyleClass("viewing-resource");
 
@@ -739 +741 @@
     _getPopoverAnchor: function(element)
     {
-        var anchor = element.enclosingNodeOrSelfWithClass("resources-graph-bar-area");
+        var anchor = element.enclosingNodeOrSelfWithClass("resources-graph-bar") || element.enclosingNodeOrSelfWithClass("resources-graph-label");
         if (!anchor)
             return null;
-        var resource = anchor.resource;
-        return resource.timing ? anchor : null;
+        var resource = anchor.parentElement.resource;
+        return resource && resource.timing ? anchor : null;
     },
 
@@ -749 +751 @@
     {
         var tableElement = document.createElement("table");
-        var resource = anchor.resource;
+        var resource = anchor.parentElement.resource;
         var data = [WebInspector.UIString("Blocking"), resource.timing.requestTime === 0 ? "?" : Number.secondsToString(Math.max(resource.timing.requestTime - resource.startTime, 0)),
-                    WebInspector.UIString("Proxy"), resource.timing.proxyDuration == -1 ? "none" : Number.secondsToString(resource.timing.proxyDuration),
-                    WebInspector.UIString("DNS Lookup"), resource.timing.dnsDuration == -1 ? "reused" : Number.secondsToString(resource.timing.dnsDuration),
-                    WebInspector.UIString("Connecting"), resource.timing.connectDuration == -1 ? "reused" : Number.secondsToString(resource.timing.connectDuration),
+                    WebInspector.UIString("Proxy"), resource.timing.proxyDuration == -1 ? WebInspector.UIString("(none)") : Number.secondsToString(resource.timing.proxyDuration),
+                    WebInspector.UIString("DNS Lookup"), resource.timing.dnsDuration == -1 ? WebInspector.UIString("(reused)") : Number.secondsToString(resource.timing.dnsDuration),
+                    WebInspector.UIString("Connecting"), resource.timing.connectDuration == -1 ? WebInspector.UIString("(reused)") : Number.secondsToString(resource.timing.connectDuration),
                     WebInspector.UIString("Sending"), Number.secondsToString(resource.timing.sendDuration),
                     WebInspector.UIString("Waiting"), Number.secondsToString(resource.timing.receiveHeadersDuration),
@@ -767 +769 @@
 
             td = document.createElement("td");
+            td.align = "right";
             td.textContent = data[i + 1];
             tr.appendChild(td);
@@ -772 +775 @@
 
         var popover = new WebInspector.Popover(tableElement);
-        popover.show(anchor.firstChild.nextSibling);
+        popover.show(anchor);
         return popover;
     },
@@ -903 +906 @@
             var leftLabel = rightLabel;
 
-        if (resource.connectionID)
+        if (resource.timing)
             return {left: leftLabel, right: rightLabel};