Diff
Modified: trunk/LayoutTests/ChangeLog (114975 => 114976)
--- trunk/LayoutTests/ChangeLog 2012-04-24 01:12:18 UTC (rev 114975)
+++ trunk/LayoutTests/ChangeLog 2012-04-24 01:25:43 UTC (rev 114976)
@@ -1,3 +1,19 @@
+2012-04-23 Sheriff Bot <webkit.review....@gmail.com>
+
+ Unreviewed, rolling out r114965.
+ http://trac.webkit.org/changeset/114965
+ https://bugs.webkit.org/show_bug.cgi?id=84665
+
+ Four new resource load delegate test failures (Requested by
+ jernoble on #webkit).
+
+ * http/tests/cache/cancel-during-failure-crash-expected.txt: Removed.
+ * http/tests/cache/cancel-during-failure-crash.html: Removed.
+ * platform/chromium-mac/security/block-test-expected.txt:
+ * platform/chromium-win/security/block-test-expected.txt:
+ * platform/gtk/security/block-test-expected.txt:
+ * platform/mac/security/block-test-expected.txt:
+
2012-04-23 Beth Dakin <bda...@apple.com>
https://bugs.webkit.org/show_bug.cgi?id=84649
Deleted: trunk/LayoutTests/http/tests/cache/cancel-during-failure-crash-expected.txt (114975 => 114976)
--- trunk/LayoutTests/http/tests/cache/cancel-during-failure-crash-expected.txt 2012-04-24 01:12:18 UTC (rev 114975)
+++ trunk/LayoutTests/http/tests/cache/cancel-during-failure-crash-expected.txt 2012-04-24 01:25:43 UTC (rev 114976)
@@ -1 +0,0 @@
-PASS
Deleted: trunk/LayoutTests/http/tests/cache/cancel-during-failure-crash.html (114975 => 114976)
--- trunk/LayoutTests/http/tests/cache/cancel-during-failure-crash.html 2012-04-24 01:12:18 UTC (rev 114975)
+++ trunk/LayoutTests/http/tests/cache/cancel-during-failure-crash.html 2012-04-24 01:25:43 UTC (rev 114976)
@@ -1,22 +0,0 @@
-<html>
-<body>
-<script>
-if (window.layoutTestController) {
- layoutTestController.dumpAsText();
- layoutTestController.waitUntilDone();
-}
-
-var img = new Image();
-img._onerror_ = function() {
- // cancel resource load within didFail()
- window.stop();
- document.body.appendChild(document.createTextNode("PASS"));
- layoutTestController.notifyDone();
-}
-
-// Port 7 will likely refuse the connection, causing a didFail()
-// from the network stack.
-img.src = ""
-</script>
-</body>
-</html>
Modified: trunk/LayoutTests/platform/chromium-mac/security/block-test-expected.txt (114975 => 114976)
--- trunk/LayoutTests/platform/chromium-mac/security/block-test-expected.txt 2012-04-24 01:12:18 UTC (rev 114975)
+++ trunk/LayoutTests/platform/chromium-mac/security/block-test-expected.txt 2012-04-24 01:25:43 UTC (rev 114976)
@@ -1,7 +1,7 @@
http://255.255.255.255:1/test.jpg - willSendRequest <NSURLRequest URL http://255.255.255.255:1/test.jpg, main document URL block-test.html, http method GET> redirectResponse (null)
<unknown> - didFinishLoading
+http://255.255.255.255:1/test.jpg - didFailLoadingWithError: <NSError domain WebKitErrorDomain, code 103, failing URL "http://255.255.255.255:1/test.jpg">
http://255.255.255.255:7/test.jpg - willSendRequest <NSURLRequest URL http://255.255.255.255:7/test.jpg, main document URL block-test.html, http method GET> redirectResponse (null)
-http://255.255.255.255:1/test.jpg - didFailLoadingWithError: <NSError domain WebKitErrorDomain, code 103, failing URL "http://255.255.255.255:1/test.jpg">
http://255.255.255.255:7/test.jpg - didFailLoadingWithError: <NSError domain WebKitErrorDomain, code 103, failing URL "http://255.255.255.255:7/test.jpg">
http://255.255.255.255:9/test.jpg - willSendRequest <NSURLRequest URL http://255.255.255.255:9/test.jpg, main document URL block-test.html, http method GET> redirectResponse (null)
http://255.255.255.255:9/test.jpg - didFailLoadingWithError: <NSError domain WebKitErrorDomain, code 103, failing URL "http://255.255.255.255:9/test.jpg">
Modified: trunk/LayoutTests/platform/chromium-win/security/block-test-expected.txt (114975 => 114976)
--- trunk/LayoutTests/platform/chromium-win/security/block-test-expected.txt 2012-04-24 01:12:18 UTC (rev 114975)
+++ trunk/LayoutTests/platform/chromium-win/security/block-test-expected.txt 2012-04-24 01:25:43 UTC (rev 114976)
@@ -1,7 +1,7 @@
http://255.255.255.255:1/test.jpg - willSendRequest <NSURLRequest URL http://255.255.255.255:1/test.jpg, main document URL block-test.html, http method GET> redirectResponse (null)
<unknown> - didFinishLoading
+http://255.255.255.255:1/test.jpg - didFailLoadingWithError: <NSError domain WebKitErrorDomain, code 103, failing URL "http://255.255.255.255:1/test.jpg">
http://255.255.255.255:7/test.jpg - willSendRequest <NSURLRequest URL http://255.255.255.255:7/test.jpg, main document URL block-test.html, http method GET> redirectResponse (null)
-http://255.255.255.255:1/test.jpg - didFailLoadingWithError: <NSError domain WebKitErrorDomain, code 103, failing URL "http://255.255.255.255:1/test.jpg">
http://255.255.255.255:7/test.jpg - didFailLoadingWithError: <NSError domain WebKitErrorDomain, code 103, failing URL "http://255.255.255.255:7/test.jpg">
http://255.255.255.255:9/test.jpg - willSendRequest <NSURLRequest URL http://255.255.255.255:9/test.jpg, main document URL block-test.html, http method GET> redirectResponse (null)
http://255.255.255.255:9/test.jpg - didFailLoadingWithError: <NSError domain WebKitErrorDomain, code 103, failing URL "http://255.255.255.255:9/test.jpg">
Modified: trunk/LayoutTests/platform/gtk/security/block-test-expected.txt (114975 => 114976)
--- trunk/LayoutTests/platform/gtk/security/block-test-expected.txt 2012-04-24 01:12:18 UTC (rev 114975)
+++ trunk/LayoutTests/platform/gtk/security/block-test-expected.txt 2012-04-24 01:25:43 UTC (rev 114976)
@@ -1,7 +1,7 @@
http://255.255.255.255:1/test.jpg - willSendRequest <NSURLRequest URL http://255.255.255.255:1/test.jpg, main document URL block-test.html, http method GET> redirectResponse (null)
<unknown> - didFinishLoading
+http://255.255.255.255:1/test.jpg - didFailLoadingWithError: <NSError domain WebKitErrorDomain, code 103, failing URL "http://255.255.255.255:1/test.jpg">
http://255.255.255.255:7/test.jpg - willSendRequest <NSURLRequest URL http://255.255.255.255:7/test.jpg, main document URL block-test.html, http method GET> redirectResponse (null)
-http://255.255.255.255:1/test.jpg - didFailLoadingWithError: <NSError domain WebKitErrorDomain, code 103, failing URL "http://255.255.255.255:1/test.jpg">
http://255.255.255.255:7/test.jpg - didFailLoadingWithError: <NSError domain WebKitErrorDomain, code 103, failing URL "http://255.255.255.255:7/test.jpg">
http://255.255.255.255:9/test.jpg - willSendRequest <NSURLRequest URL http://255.255.255.255:9/test.jpg, main document URL block-test.html, http method GET> redirectResponse (null)
http://255.255.255.255:9/test.jpg - didFailLoadingWithError: <NSError domain WebKitErrorDomain, code 103, failing URL "http://255.255.255.255:9/test.jpg">
Modified: trunk/LayoutTests/platform/mac/security/block-test-expected.txt (114975 => 114976)
--- trunk/LayoutTests/platform/mac/security/block-test-expected.txt 2012-04-24 01:12:18 UTC (rev 114975)
+++ trunk/LayoutTests/platform/mac/security/block-test-expected.txt 2012-04-24 01:25:43 UTC (rev 114976)
@@ -1,7 +1,7 @@
http://255.255.255.255:1/test.jpg - willSendRequest <NSURLRequest URL http://255.255.255.255:1/test.jpg, main document URL block-test.html, http method GET> redirectResponse (null)
<unknown> - didFinishLoading
+http://255.255.255.255:1/test.jpg - didFailLoadingWithError: <NSError domain WebKitErrorDomain, code 103, failing URL "http://255.255.255.255:1/test.jpg">
http://255.255.255.255:7/test.jpg - willSendRequest <NSURLRequest URL http://255.255.255.255:7/test.jpg, main document URL block-test.html, http method GET> redirectResponse (null)
-http://255.255.255.255:1/test.jpg - didFailLoadingWithError: <NSError domain WebKitErrorDomain, code 103, failing URL "http://255.255.255.255:1/test.jpg">
http://255.255.255.255:7/test.jpg - didFailLoadingWithError: <NSError domain WebKitErrorDomain, code 103, failing URL "http://255.255.255.255:7/test.jpg">
http://255.255.255.255:9/test.jpg - willSendRequest <NSURLRequest URL http://255.255.255.255:9/test.jpg, main document URL block-test.html, http method GET> redirectResponse (null)
http://255.255.255.255:9/test.jpg - didFailLoadingWithError: <NSError domain WebKitErrorDomain, code 103, failing URL "http://255.255.255.255:9/test.jpg">
Modified: trunk/Source/WebCore/ChangeLog (114975 => 114976)
--- trunk/Source/WebCore/ChangeLog 2012-04-24 01:12:18 UTC (rev 114975)
+++ trunk/Source/WebCore/ChangeLog 2012-04-24 01:25:43 UTC (rev 114976)
@@ -1,3 +1,18 @@
+2012-04-23 Sheriff Bot <webkit.review....@gmail.com>
+
+ Unreviewed, rolling out r114965.
+ http://trac.webkit.org/changeset/114965
+ https://bugs.webkit.org/show_bug.cgi?id=84665
+
+ Four new resource load delegate test failures (Requested by
+ jernoble on #webkit).
+
+ * loader/SubresourceLoader.cpp:
+ (WebCore::SubresourceLoader::didFinishLoading):
+ (WebCore::SubresourceLoader::didFail):
+ (WebCore::SubresourceLoader::willCancel):
+ (WebCore::SubresourceLoader::releaseResources):
+
2012-04-23 Beth Dakin <bda...@apple.com>
https://bugs.webkit.org/show_bug.cgi?id=84649
Modified: trunk/Source/WebCore/loader/SubresourceLoader.cpp (114975 => 114976)
--- trunk/Source/WebCore/loader/SubresourceLoader.cpp 2012-04-24 01:12:18 UTC (rev 114975)
+++ trunk/Source/WebCore/loader/SubresourceLoader.cpp 2012-04-24 01:25:43 UTC (rev 114976)
@@ -275,10 +275,6 @@
m_resource->setLoadFinishTime(finishTime);
m_resource->data(resourceData(), true);
m_resource->finish();
- m_requestCountTracker.clear();
- if (reachedTerminalState())
- return;
- m_document->cachedResourceLoader()->loadDone();
ResourceLoader::didFinishLoading(finishTime);
}
@@ -296,35 +292,31 @@
m_resource->error(CachedResource::LoadError);
if (!m_resource->isPreloaded())
memoryCache()->remove(m_resource);
- m_requestCountTracker.clear();
- if (reachedTerminalState())
- return;
- m_document->cachedResourceLoader()->loadDone();
ResourceLoader::didFail(error);
}
void SubresourceLoader::willCancel(const ResourceError&)
{
- if (m_state == Uninitialized)
- return;
- if (m_state == Initialized) {
- ASSERT(!reachedTerminalState());
- LOG(ResourceLoading, "Cancelled load of '%s'.\n", m_resource->url().string().latin1().data());
+ if (m_state != Initialized)
+ return;
+ ASSERT(!reachedTerminalState());
+ LOG(ResourceLoading, "Cancelled load of '%s'.\n", m_resource->url().string().latin1().data());
- RefPtr<SubresourceLoader> protect(this);
- m_state = Finishing;
- if (m_resource->resourceToRevalidate())
- memoryCache()->revalidationFailed(m_resource);
- memoryCache()->remove(m_resource);
- }
- m_requestCountTracker.clear();
- m_document->cachedResourceLoader()->loadDone();
+ RefPtr<SubresourceLoader> protect(this);
+ m_state = Finishing;
+ if (m_resource->resourceToRevalidate())
+ memoryCache()->revalidationFailed(m_resource);
+ memoryCache()->remove(m_resource);
}
void SubresourceLoader::releaseResources()
{
ASSERT(!reachedTerminalState());
if (m_state != Uninitialized) {
+ m_requestCountTracker.clear();
+ m_document->cachedResourceLoader()->loadDone();
+ if (reachedTerminalState())
+ return;
m_resource->stopLoading();
m_documentLoader->removeSubresourceLoader(this);
}
