Skip to content
Permalink
Browse files
2010-04-14 Sheriff Bot <webkit.review.bot@gmail.com>
        Unreviewed, rolling out r57609.
        http://trac.webkit.org/changeset/57609
        https://bugs.webkit.org/show_bug.cgi?id=37614

        "Broke multiple builders.  Probably needs new test results,
        but may be an Inspector bug." (Requested by eseidel on
        #webkit).

        * inspector/console-resource-errors-expected.txt: Removed.
        * inspector/console-resource-errors.html: Removed.
2010-04-14  Sheriff Bot  <webkit.review.bot@gmail.com>

        Unreviewed, rolling out r57609.
        http://trac.webkit.org/changeset/57609
        https://bugs.webkit.org/show_bug.cgi?id=37614

        "Broke multiple builders.  Probably needs new test results,
        but may be an Inspector bug." (Requested by eseidel on
        #webkit).

        * 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):

Canonical link: https://commits.webkit.org/48904@main
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@57616 268f45cc-cd09-0410-ab3c-d52691b4dbfc
  • Loading branch information
eseidel committed Apr 14, 2010
1 parent 360e93a commit a6c61bd3ed266d09a88176a2a44cf6fb80d90496
Showing 7 changed files with 42 additions and 58 deletions.
@@ -1,3 +1,16 @@
2010-04-14 Sheriff Bot <webkit.review.bot@gmail.com>

Unreviewed, rolling out r57609.
http://trac.webkit.org/changeset/57609
https://bugs.webkit.org/show_bug.cgi?id=37614

"Broke multiple builders. Probably needs new test results,
but may be an Inspector bug." (Requested by eseidel on
#webkit).

* inspector/console-resource-errors-expected.txt: Removed.
* inspector/console-resource-errors.html: Removed.

2010-04-14 Alejandro G. Castro <alex@igalia.com>

Rubber-stamped by Xan Lopez.

This file was deleted.

This file was deleted.

@@ -1,3 +1,21 @@
2010-04-14 Sheriff Bot <webkit.review.bot@gmail.com>

Unreviewed, rolling out r57609.
http://trac.webkit.org/changeset/57609
https://bugs.webkit.org/show_bug.cgi?id=37614

"Broke multiple builders. Probably needs new test results,
but may be an Inspector bug." (Requested by eseidel on
#webkit).

* 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 Steve Falkenburg <sfalken@apple.com>

Reviewed by Dan Bernstein.
@@ -892,19 +892,15 @@ void InspectorController::willSendRequest(unsigned long identifier, const Resour

void InspectorController::didReceiveResponse(unsigned long identifier, const ResourceResponse& response)
{
if (RefPtr<InspectorResource> resource = getTrackedResource(identifier)) {
resource->updateResponse(response);
resource->markResponseReceivedTime();
RefPtr<InspectorResource> resource = getTrackedResource(identifier);
if (!resource)
return;

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() + ")";
resource->updateResponse(response);
resource->markResponseReceivedTime();

addMessageToConsole(OtherMessageSource, LogMessageType, ErrorMessageLevel, message, 0, response.url().string());
}
if (resource != m_mainResource && m_frontend)
resource->updateScriptObject(m_frontend.get());
}

void InspectorController::didReceiveContentLength(unsigned long identifier, int lengthReceived)
@@ -935,16 +931,11 @@ void InspectorController::didFinishLoading(unsigned long identifier)
resource->updateScriptObject(m_frontend.get());
}

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);
if (!resource)
return;
@@ -536,12 +536,6 @@ WebInspector.Resource.prototype = {

_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
|| this.type === WebInspector.Resource.Type.XHR)
@@ -443,6 +443,9 @@ WebInspector.ResourcesPanel.prototype = {
if (newView.__proto__ === resource._resourcesView.__proto__)
return;

resource.warnings = 0;
resource.errors = 0;

if (!this.currentQuery && resource._itemsTreeElement)
resource._itemsTreeElement.updateErrorsAndWarnings();

0 comments on commit a6c61bd

Please sign in to comment.