[Web Inspector] Fix initiator name issue in reload scenario for Network Panel.

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

Patch by Pan Deng <pan.deng@intel.com> on 2013-02-14
Reviewed by Vsevolod Vlasov.

WebInspector.displayNameForURL() does not work as expected in the reload scenario,
for example, "http://www.yahoo.com/" was trimed to "/" at one time, but at another,
the full host name will be displayed.
This fix return host + "/" in the issue scenario, and keep with get displayName() in ParsedURL.

No new tests.

* inspector/front-end/ParsedURL.js:
(WebInspector.ParsedURL.prototype.get displayName): append "/" in the display host scenario.
* inspector/front-end/ResourceUtils.js:
(WebInspector.displayNameForURL): add host in the head if url trimed as a "/".

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@142871 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index ed27b2f07507778468527cfefb1764ff2a8cc826..940742392194b1f697aac648cd18dbe5803c3cdb 100644 (file)
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,22 @@
+2013-02-14  Pan Deng  <pan.deng@intel.com>
+
+        [Web Inspector] Fix initiator name issue in reload scenario for Network Panel.
+        https://bugs.webkit.org/show_bug.cgi?id=108746.
+
+        Reviewed by Vsevolod Vlasov.
+
+        WebInspector.displayNameForURL() does not work as expected in the reload scenario,
+        for example, "http://www.yahoo.com/" was trimed to "/" at one time, but at another,
+        the full host name will be displayed.
+        This fix return host + "/" in the issue scenario, and keep with get displayName() in ParsedURL.
+
+        No new tests.
+
+        * inspector/front-end/ParsedURL.js:
+        (WebInspector.ParsedURL.prototype.get displayName): append "/" in the display host scenario.
+        * inspector/front-end/ResourceUtils.js:
+        (WebInspector.displayNameForURL): add host in the head if url trimed as a "/".
+
 2013-02-14  Alexei Filippov  <alph@chromium.org>
 
         Web Inspector: fix to record button remaining red after heap snapshot is taken

diff --git a/Source/WebCore/inspector/front-end/ParsedURL.js b/Source/WebCore/inspector/front-end/ParsedURL.js
index b75eacc3044443b6505066292944a0609c40d2a6..9a802bb1fe8cbdb4294e51589db56954a8faa531 100644 (file)
--- a/Source/WebCore/inspector/front-end/ParsedURL.js
+++ b/Source/WebCore/inspector/front-end/ParsedURL.js
@@ -152,8 +152,8 @@ WebInspector.ParsedURL.prototype = {
             return this.url;
 
         this._displayName = this.lastPathComponent;
-        if (!this._displayName)
-            this._displayName = this.host;
+        if (!this._displayName && this.host)
+            this._displayName = this.host + "/";
         if (!this._displayName && this.url)
             this._displayName = this.url.trimURL(WebInspector.inspectedPageDomain ? WebInspector.inspectedPageDomain : "");
         if (this._displayName === "/")

diff --git a/Source/WebCore/inspector/front-end/ResourceUtils.js b/Source/WebCore/inspector/front-end/ResourceUtils.js
index e73baa6841f76f0aa6077491743f615195e0c873..e5bc2b49636c3f8d87ac7a47181723bce9479fdf 100644 (file)
--- a/Source/WebCore/inspector/front-end/ResourceUtils.js
+++ b/Source/WebCore/inspector/front-end/ResourceUtils.js
@@ -75,7 +75,11 @@ WebInspector.displayNameForURL = function(url)
             return url.substring(index);
     }
 
-    return parsedURL ? url.trimURL(parsedURL.host) : url;
+    if (!parsedURL)
+        return url;
+
+    var displayName = url.trimURL(parsedURL.host);
+    return displayName === "/" ? parsedURL.host + "/" : displayName;
 }
 
 /**