Diff
Modified: trunk/LayoutTests/ChangeLog (114643 => 114644)
--- trunk/LayoutTests/ChangeLog 2012-04-19 16:53:14 UTC (rev 114643)
+++ trunk/LayoutTests/ChangeLog 2012-04-19 16:59:34 UTC (rev 114644)
@@ -1,3 +1,16 @@
+2012-04-19 Sheriff Bot <webkit.review....@gmail.com>
+
+ Unreviewed, rolling out r114626.
+ http://trac.webkit.org/changeset/114626
+ https://bugs.webkit.org/show_bug.cgi?id=84349
+
+ caused new assertions in debug builds (Requested by smfr_ on
+ #webkit).
+
+ * http/tests/inspector/network/network-image-404-expected.txt: Removed.
+ * http/tests/inspector/network/network-image-404.html: Removed.
+ * http/tests/inspector/network/resources/404.php: Removed.
+
2012-04-19 Victor Carbune <vcarb...@adobe.com>
Display a TextTrackCue when snap-to-lines flag is not set
Deleted: trunk/LayoutTests/http/tests/inspector/network/network-image-404-expected.txt (114643 => 114644)
--- trunk/LayoutTests/http/tests/inspector/network/network-image-404-expected.txt 2012-04-19 16:53:14 UTC (rev 114643)
+++ trunk/LayoutTests/http/tests/inspector/network/network-image-404-expected.txt 2012-04-19 16:59:34 UTC (rev 114644)
@@ -1,9 +0,0 @@
-CONSOLE MESSAGE: line 15: Done.
-Tests content is available for failed image request.
-
-Bug 84265
-http://127.0.0.1:8000/inspector/network/resources/404.php
-resource.type: image
-resource.content before requesting content: undefined
-resource.content after requesting content: 404 - resource was not found.
-
Deleted: trunk/LayoutTests/http/tests/inspector/network/network-image-404.html (114643 => 114644)
--- trunk/LayoutTests/http/tests/inspector/network/network-image-404.html 2012-04-19 16:53:14 UTC (rev 114643)
+++ trunk/LayoutTests/http/tests/inspector/network/network-image-404.html 2012-04-19 16:59:34 UTC (rev 114644)
@@ -1,54 +0,0 @@
-<html>
-<head>
-<script src=""
-<script src=""
-<script>
-function loadData()
-{
- var image = new Image();
- image.src = ""
- image._onerror_ = resourceLoaded;
-}
-
-function resourceLoaded()
-{
- console.log("Done.");
-}
-
-function test()
-{
- // Since this test could be run together with other inspector backend cache
- // tests, we need to reset size limits to default ones.
- InspectorTest.resetInspectorResourcesData(step1);
-
- function step1()
- {
- InspectorTest.addConsoleSniffer(step2);
- InspectorTest.evaluateInPage("loadData()");
- }
-
- function step2()
- {
- var request1 = WebInspector.panels.network.requests[WebInspector.panels.network.requests.length - 1];
- InspectorTest.addResult(request1.url);
- InspectorTest.addResult("resource.type: " + request1.type);
- InspectorTest.addResult("resource.content before requesting content: " + request1.content);
- InspectorTest.assertTrue(!request1.failed, "Resource loading failed.");
- request1.requestContent(step3);
- }
-
- function step3()
- {
- var request1 = WebInspector.panels.network.requests[WebInspector.panels.network.requests.length - 1];
- InspectorTest.addResult("resource.content after requesting content: " + request1.content);
-
- InspectorTest.completeTest();
- }
-}
-</script>
-</head>
-<body _onload_="runTest()">
-<p>Tests content is available for failed image request.</p>
-<a href="" 84265</a>
-</body>
-</html>
Deleted: trunk/LayoutTests/http/tests/inspector/network/resources/404.php (114643 => 114644)
--- trunk/LayoutTests/http/tests/inspector/network/resources/404.php 2012-04-19 16:53:14 UTC (rev 114643)
+++ trunk/LayoutTests/http/tests/inspector/network/resources/404.php 2012-04-19 16:59:34 UTC (rev 114644)
@@ -1,4 +0,0 @@
-<?php
- header("HTTP/1.0 404 Not Found");
- echo("404 - resource was not found.");
-?>
Modified: trunk/Source/WebCore/ChangeLog (114643 => 114644)
--- trunk/Source/WebCore/ChangeLog 2012-04-19 16:53:14 UTC (rev 114643)
+++ trunk/Source/WebCore/ChangeLog 2012-04-19 16:59:34 UTC (rev 114644)
@@ -1,3 +1,22 @@
+2012-04-19 Sheriff Bot <webkit.review....@gmail.com>
+
+ Unreviewed, rolling out r114626.
+ http://trac.webkit.org/changeset/114626
+ https://bugs.webkit.org/show_bug.cgi?id=84349
+
+ caused new assertions in debug builds (Requested by smfr_ on
+ #webkit).
+
+ * inspector/InspectorResourceAgent.cpp:
+ (WebCore::InspectorResourceAgent::didReceiveData):
+ * inspector/NetworkResourcesData.cpp:
+ (WebCore::NetworkResourcesData::responseReceived):
+ * inspector/NetworkResourcesData.h:
+ (ResourceData):
+ (NetworkResourcesData):
+ * inspector/front-end/RequestView.js:
+ (WebInspector.RequestView.hasTextContent):
+
2012-04-19 Mark Pilgrim <pilg...@chromium.org>
[Chromium] Call mimeRegistry directly
Modified: trunk/Source/WebCore/inspector/InspectorResourceAgent.cpp (114643 => 114644)
--- trunk/Source/WebCore/inspector/InspectorResourceAgent.cpp 2012-04-19 16:53:14 UTC (rev 114643)
+++ trunk/Source/WebCore/inspector/InspectorResourceAgent.cpp 2012-04-19 16:59:34 UTC (rev 114644)
@@ -276,15 +276,10 @@
didReceiveData(identifier, 0, cachedResourceSize, 0);
}
-static bool isErrorStatusCode(int statusCode)
-{
- return statusCode >= 400;
-}
-
void InspectorResourceAgent::didReceiveData(unsigned long identifier, const char* data, int dataLength, int encodedDataLength)
{
String requestId = IdentifiersFactory::requestId(identifier);
- if (data && (m_resourcesData->resourceType(requestId) == InspectorPageAgent::OtherResource || (m_resourcesData->resourceType(requestId) != InspectorPageAgent::DocumentResource && isErrorStatusCode(m_resourcesData->httpStatusCode(requestId)))))
+ if (data && m_resourcesData->resourceType(requestId) == InspectorPageAgent::OtherResource)
m_resourcesData->maybeAddResourceData(requestId, data, dataLength);
m_frontend->dataReceived(requestId, currentTime(), dataLength, encodedDataLength);
Modified: trunk/Source/WebCore/inspector/NetworkResourcesData.cpp (114643 => 114644)
--- trunk/Source/WebCore/inspector/NetworkResourcesData.cpp 2012-04-19 16:53:14 UTC (rev 114643)
+++ trunk/Source/WebCore/inspector/NetworkResourcesData.cpp 2012-04-19 16:59:34 UTC (rev 114644)
@@ -147,7 +147,6 @@
resourceData->setFrameId(frameId);
resourceData->setUrl(response.url());
resourceData->setDecoder(createOtherResourceTextDecoder(response.mimeType(), response.textEncodingName()));
- resourceData->setHTTPStatusCode(response.httpStatusCode());
}
void NetworkResourcesData::setResourceType(const String& requestId, InspectorPageAgent::ResourceType type)
@@ -166,14 +165,6 @@
return resourceData->type();
}
-int NetworkResourcesData::httpStatusCode(const String& requestId)
-{
- ResourceData* resourceData = m_requestIdToResourceDataMap.get(requestId);
- if (!resourceData)
- return 0;
- return resourceData->httpStatusCode();
-}
-
void NetworkResourcesData::setResourceContent(const String& requestId, const String& content)
{
ResourceData* resourceData = m_requestIdToResourceDataMap.get(requestId);
Modified: trunk/Source/WebCore/inspector/NetworkResourcesData.h (114643 => 114644)
--- trunk/Source/WebCore/inspector/NetworkResourcesData.h 2012-04-19 16:53:14 UTC (rev 114643)
+++ trunk/Source/WebCore/inspector/NetworkResourcesData.h 2012-04-19 16:59:34 UTC (rev 114644)
@@ -73,9 +73,6 @@
InspectorPageAgent::ResourceType type() const { return m_type; }
void setType(InspectorPageAgent::ResourceType type) { m_type = type; }
- int httpStatusCode() const { return m_httpStatusCode; }
- void setHTTPStatusCode(int httpStatusCode) { m_httpStatusCode = httpStatusCode; }
-
String textEncodingName() const { return m_textEncodingName; }
void setTextEncodingName(const String& textEncodingName) { m_textEncodingName = textEncodingName; }
@@ -102,7 +99,6 @@
RefPtr<SharedBuffer> m_dataBuffer;
bool m_isContentPurged;
InspectorPageAgent::ResourceType m_type;
- int m_httpStatusCode;
String m_textEncodingName;
RefPtr<TextResourceDecoder> m_decoder;
@@ -119,7 +115,6 @@
void responseReceived(const String& requestId, const String& frameId, const ResourceResponse&);
void setResourceType(const String& requestId, InspectorPageAgent::ResourceType);
InspectorPageAgent::ResourceType resourceType(const String& requestId);
- int httpStatusCode(const String& requestId);
void setResourceContent(const String& requestId, const String& content);
void maybeAddResourceData(const String& requestId, const char* data, int dataLength);
void maybeDecodeDataToContent(const String& requestId);
Modified: trunk/Source/WebCore/inspector/front-end/RequestView.js (114643 => 114644)
--- trunk/Source/WebCore/inspector/front-end/RequestView.js 2012-04-19 16:53:14 UTC (rev 114643)
+++ trunk/Source/WebCore/inspector/front-end/RequestView.js 2012-04-19 16:59:34 UTC (rev 114644)
@@ -58,7 +58,7 @@
{
if (request.type.isTextType())
return true;
- if (request.type === WebInspector.resourceTypes.Other || request.hasErrorStatusCode())
+ if (request.type === WebInspector.resourceTypes.Other)
return request.content && !request.contentEncoded;
return false;
}
