Changeset 84607 in webkit

Timestamp:

Apr 22, 2011 12:09:30 AM (13 years ago)

Author:

caseq@chromium.org

Message:

2011-04-21 Andrey Kosyakov <​caseq@chromium.org>

Reviewed by Yury Semikhatsky.

Web Inspector: exception in front-end when user selects resource info for resource that does not have response headers yet
​https://bugs.webkit.org/show_bug.cgi?id=59123

• inspector/front-end/ResourceCookiesView.js: (WebInspector.ResourceCookiesView): (WebInspector.ResourceCookiesView.prototype.show): (WebInspector.ResourceCookiesView.prototype.get _gotCookies): (WebInspector.ResourceCookiesView.prototype._buildCookiesTable):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• inspector/front-end/ResourceCookiesView.js (modified) (3 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-04-21  Andrey Kosyakov  <caseq@chromium.org>
+
+        Reviewed by Yury Semikhatsky.
+
+        Web Inspector: exception in front-end when user selects resource info for resource that does not have response headers yet
+        https://bugs.webkit.org/show_bug.cgi?id=59123
+
+        * inspector/front-end/ResourceCookiesView.js:
+        (WebInspector.ResourceCookiesView):
+        (WebInspector.ResourceCookiesView.prototype.show):
+        (WebInspector.ResourceCookiesView.prototype.get _gotCookies):
+        (WebInspector.ResourceCookiesView.prototype._buildCookiesTable):
+
 2011-04-21  Beth Dakin  <bdakin@apple.com>
 

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

@@ -36 +36 @@
     this._resource = resource;
 
-    resource.addEventListener("requestHeaders changed", this.show, this);
-    resource.addEventListener("responseHeaders changed", this.show, this);
+    resource.addEventListener("requestHeaders changed", this._refreshCookies, this);
+    resource.addEventListener("responseHeaders changed", this._refreshCookies, this);
 }
 
@@ -43 +43 @@
     show: function(parentElement)
     {
-        if (!this._resource.requestCookies && !this._resource.responseCookies) {
+        if (!this._gotCookies) {
             if (!this._emptyMsgElement) {
                 this._emptyMsgElement = document.createElement("div");
@@ -54 +54 @@
         }
 
-        if (this._emptyMsgElement)
-            this._emptyMsgElement.parentElement.removeChild(this._emptyMsgElement);
+        if (!this._cookiesTable)
+            this._buildCookiesTable();
+        WebInspector.View.prototype.show.call(this, parentElement);
+        this._cookiesTable.updateWidths();
+    },
 
-        if (!this._cookiesTable) {
-            this._cookiesTable = new WebInspector.CookiesTable(null, true, true);
-            this._cookiesTable.addCookiesFolder(WebInspector.UIString("Request Cookies"), this._resource.requestCookies);
-            this._cookiesTable.addCookiesFolder(WebInspector.UIString("Response Cookies"), this._resource.responseCookies);
-            this.element.appendChild(this._cookiesTable.element);
-        }
+    get _gotCookies()
+    {
+        return !!(this._resource.requestCookies || this._resource.responseCookies);
+    },
 
-        WebInspector.View.prototype.show.call(this, parentElement);
+    _buildCookiesTable: function()
+    {
+        this.element.removeChildren();
+
+        this._cookiesTable = new WebInspector.CookiesTable(null, true, true);
+        this._cookiesTable.addCookiesFolder(WebInspector.UIString("Request Cookies"), this._resource.requestCookies);
+        this._cookiesTable.addCookiesFolder(WebInspector.UIString("Response Cookies"), this._resource.responseCookies);
+        this.element.appendChild(this._cookiesTable.element);
+    },
+
+    _refreshCookies: function()
+    {
+        delete this._cookiesTable;
+        if (!this._gotCookies || !this.visible)
+            return;
+        this._buildCookiesTable();
         this._cookiesTable.updateWidths();
     }