Changeset 142871 in webkit

Timestamp:

Feb 14, 2013 5:01:50 AM (11 years ago)

Author:

commit-queue@webkit.org

Message:

[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 "/".

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• inspector/front-end/ParsedURL.js (modified) (1 diff)
• inspector/front-end/ResourceUtils.js (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+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>
 

trunk/Source/WebCore/inspector/front-end/ParsedURL.js

@@ -153 +153 @@
 
         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 : "");

trunk/Source/WebCore/inspector/front-end/ResourceUtils.js

@@ -76 +76 @@
     }
 
-    return parsedURL ? url.trimURL(parsedURL.host) : url;
+    if (!parsedURL)
+        return url;
+
+    var displayName = url.trimURL(parsedURL.host);
+    return displayName === "/" ? parsedURL.host + "/" : displayName;
 }