Changeset 115086 in webkit

Timestamp:

Apr 24, 2012 11:32:58 AM (12 years ago)

Author:

commit-queue@webkit.org

Message:

[chromium] Add a description field in WebURLError and show failure description in the inspector network tab.
​https://bugs.webkit.org/show_bug.cgi?id=84566

Patch by Yuzhu Shen <​yzshen@chromium.org> on 2012-04-24
Reviewed by Pavel Feldman.

Source/Platform:

• chromium/public/WebURLError.h:

(WebURLError):

Source/WebCore:

• inspector/front-end/NetworkPanel.js:

(WebInspector.NetworkDataGridNode.prototype._refreshStatusCell):

• platform/chromium/support/WebURLError.cpp:

(WebKit::WebURLError::operator=):
(WebKit::WebURLError::operator ResourceError):

Location:

trunk/Source

Files:

• Platform/ChangeLog (modified) (1 diff)
• Platform/chromium/public/WebURLError.h (modified) (1 diff)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/inspector/front-end/NetworkPanel.js (modified) (1 diff)
• WebCore/platform/chromium/support/WebURLError.cpp (modified) (2 diffs)

trunk/Source/Platform/ChangeLog

@@ +1 @@
+2012-04-24  Yuzhu Shen  <yzshen@chromium.org>
+
+        [chromium] Add a description field in WebURLError and show failure description in the inspector network tab.
+        https://bugs.webkit.org/show_bug.cgi?id=84566
+
+        Reviewed by Pavel Feldman.
+
+        * chromium/public/WebURLError.h:
+        (WebURLError):
+
 2012-04-18  James Robinson  <jamesr@chromium.org>
 

trunk/Source/Platform/chromium/public/WebURLError.h

@@ -60 +60 @@
     WebURL unreachableURL;
 
+    // A description for the error.
+    WebString localizedDescription;
+
     WebURLError() : reason(0), isCancellation(false) { }
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-04-24  Yuzhu Shen  <yzshen@chromium.org>
+
+        [chromium] Add a description field in WebURLError and show failure description in the inspector network tab.
+        https://bugs.webkit.org/show_bug.cgi?id=84566
+
+        Reviewed by Pavel Feldman.
+
+        * inspector/front-end/NetworkPanel.js:
+        (WebInspector.NetworkDataGridNode.prototype._refreshStatusCell):
+        * platform/chromium/support/WebURLError.cpp:
+        (WebKit::WebURLError::operator=):
+        (WebKit::WebURLError::operator ResourceError):
+
 2012-04-24  Rob Buis  <rbuis@rim.com>
 

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

@@ -1859 +1859 @@
 
         if (this._request.failed) {
-            if (this._request.canceled)
-                this._statusCell.setTextAndTitle(WebInspector.UIString("(canceled)"));
-            else
-                this._statusCell.setTextAndTitle(WebInspector.UIString("(failed)"));
+            var failText = this._request.canceled ? WebInspector.UIString("(canceled)") : WebInspector.UIString("(failed)");
+            if (this._request.localizedFailDescription) {
+                this._statusCell.appendChild(document.createTextNode(failText));
+                this._appendSubtitle(this._statusCell, this._request.localizedFailDescription);
+                this._statusCell.title = failText + " " + this._request.localizedFailDescription;
+            } else {
+                this._statusCell.setTextAndTitle(failText);
+            }
             this._statusCell.addStyleClass("network-dim-cell");
             this.element.addStyleClass("network-error-row");

trunk/Source/WebCore/platform/chromium/support/WebURLError.cpp

@@ -54 +54 @@
         unreachableURL = KURL(ParsedURLString, error.failingURL());
         isCancellation = error.isCancellation();
+        localizedDescription = error.localizedDescription();
     }
     return *this;
@@ -65 +66 @@
     ResourceError resourceError = ResourceError(domain, reason,
                                                 String::fromUTF8(spec.data(),
-                                                spec.length()), String());
+                                                spec.length()),
+                                                localizedDescription);
     resourceError.setIsCancellation(isCancellation);
     return resourceError;