Changeset 57609 in webkit

Timestamp:

Apr 14, 2010 2:49:03 PM (14 years ago)

Author:

eric@webkit.org

Message:

2010-04-14 Andrey Kosyakov <​caseq@chromium.ru>

Reviewed by Timothy Hatcher.

Log error message to inspector console if a resource fails to load.
Disable checking of mime-type consistency for failed resources.
​https://bugs.webkit.org/show_bug.cgi?id=37215

• inspector/console-resource-errors-expected.txt: Added.
• inspector/console-resource-errors.html: Added.

2010-04-14 Andrey Kosyakov <​caseq@chromium.ru>

Reviewed by Timothy Hatcher.

Log error message to inspector console if a resource fails to load.
Disable checking of mime-type consistency for failed resources.
​https://bugs.webkit.org/show_bug.cgi?id=37215

Test: inspector/console-resource-errors.html

• inspector/InspectorController.cpp: (WebCore::InspectorController::didReceiveResponse): (WebCore::InspectorController::didFailLoading):
• inspector/front-end/Resource.js: (WebInspector.Resource.prototype._mimeTypeIsConsistentWithType):
• inspector/front-end/ResourcesPanel.js: (WebInspector.ResourcesPanel.prototype.recreateViewForResourceIfNeeded):

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/inspector/console-resource-errors-expected.txt (added)
• LayoutTests/inspector/console-resource-errors.html (added)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/inspector/InspectorController.cpp (modified) (2 diffs)
• WebCore/inspector/front-end/Resource.js (modified) (1 diff)
• WebCore/inspector/front-end/ResourcesPanel.js (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2010-04-14  Andrey Kosyakov  <caseq@chromium.ru>
+
+        Reviewed by Timothy Hatcher.
+
+        Log error message to inspector console if a resource fails to load.
+        Disable checking of mime-type consistency for failed resources.
+        https://bugs.webkit.org/show_bug.cgi?id=37215
+
+        * inspector/console-resource-errors-expected.txt: Added.
+        * inspector/console-resource-errors.html: Added.
+
 2010-04-14  Alejandro G. Castro  <alex@igalia.com>
 

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-04-14  Andrey Kosyakov  <caseq@chromium.ru>
+
+        Reviewed by Timothy Hatcher.
+
+        Log error message to inspector console if a resource fails to load.
+        Disable checking of mime-type consistency for failed resources.
+        https://bugs.webkit.org/show_bug.cgi?id=37215
+
+        Test: inspector/console-resource-errors.html
+
+        * inspector/InspectorController.cpp:
+        (WebCore::InspectorController::didReceiveResponse):
+        (WebCore::InspectorController::didFailLoading):
+        * inspector/front-end/Resource.js:
+        (WebInspector.Resource.prototype._mimeTypeIsConsistentWithType):
+        * inspector/front-end/ResourcesPanel.js:
+        (WebInspector.ResourcesPanel.prototype.recreateViewForResourceIfNeeded):
+
 2010-04-14  Sheriff Bot  <webkit.review.bot@gmail.com>
 

trunk/WebCore/inspector/InspectorController.cpp

@@ -893 +893 @@
 void InspectorController::didReceiveResponse(unsigned long identifier, const ResourceResponse& response)
 {
-    RefPtr<InspectorResource> resource = getTrackedResource(identifier);
-    if (!resource)
-        return;
-
-    resource->updateResponse(response);
-    resource->markResponseReceivedTime();
-
-    if (resource != m_mainResource && m_frontend)
-        resource->updateScriptObject(m_frontend.get());
+    if (RefPtr<InspectorResource> resource = getTrackedResource(identifier)) {
+        resource->updateResponse(response);
+        resource->markResponseReceivedTime();
+
+        if (resource != m_mainResource && m_frontend)
+            resource->updateScriptObject(m_frontend.get());
+    }
+    if (response.httpStatusCode() >= 400) {
+        // The ugly code below is due to that String::format() is not utf8-safe at the moment.
+        String message = String::format("Failed to load resource: the server responded with a status of %u (", response.httpStatusCode()) + response.httpStatusText() + ")";
+
+        addMessageToConsole(OtherMessageSource, LogMessageType, ErrorMessageLevel, message, 0, response.url().string());
+    }
 }
 
@@ -932 +936 @@
 }
 
-void InspectorController::didFailLoading(unsigned long identifier, const ResourceError& /*error*/)
+void InspectorController::didFailLoading(unsigned long identifier, const ResourceError& error)
 {
     if (m_timelineAgent)
         m_timelineAgent->didFinishLoadingResource(identifier, true);
+
+    String message = "Failed to load resource";
+    if (!error.localizedDescription().isEmpty())
+        message += ": " + error.localizedDescription();
+    addMessageToConsole(OtherMessageSource, LogMessageType, ErrorMessageLevel, message, 0, error.failingURL());
 
     RefPtr<InspectorResource> resource = getTrackedResource(identifier);

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

@@ -537 +537 @@
     _mimeTypeIsConsistentWithType: function()
     {
+        // If status is an error, content is likely to be of an inconsistent type,
+        // as it's going to be an error message. We do not want to emit a warning
+        // for this, though, as this will already be reported as resource loading failure.
+        if (this.statusCode >= 400)
+            return true;
+
         if (typeof this.type === "undefined"
          || this.type === WebInspector.Resource.Type.Other

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

@@ -444 +444 @@
             return;
 
-        resource.warnings = 0;
-        resource.errors = 0;
-
         if (!this.currentQuery && resource._itemsTreeElement)
             resource._itemsTreeElement.updateErrorsAndWarnings();