From 8502b86e7561ed2f29fbc1c0262ae46b0c01ccc1 Mon Sep 17 00:00:00 2001 From: "jer.noble@apple.com" Date: Tue, 24 Apr 2012 01:25:43 +0000 Subject: [PATCH] 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). Patch by Sheriff Bot on 2012-04-23 Source/WebCore: * loader/SubresourceLoader.cpp: (WebCore::SubresourceLoader::didFinishLoading): (WebCore::SubresourceLoader::didFail): (WebCore::SubresourceLoader::willCancel): (WebCore::SubresourceLoader::releaseResources): LayoutTests: * 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: git-svn-id: https://svn.webkit.org/repository/webkit/trunk@114976 268f45cc-cd09-0410-ab3c-d52691b4dbfc --- LayoutTests/ChangeLog | 16 ++++++++++ .../cache/cancel-during-failure-crash-expected.txt | 1 - .../tests/cache/cancel-during-failure-crash.html | 22 ------------- .../chromium-mac/security/block-test-expected.txt | 2 +- .../chromium-win/security/block-test-expected.txt | 2 +- .../platform/gtk/security/block-test-expected.txt | 2 +- .../platform/mac/security/block-test-expected.txt | 2 +- Source/WebCore/ChangeLog | 15 +++++++++ Source/WebCore/loader/SubresourceLoader.cpp | 36 +++++++++------------- 9 files changed, 49 insertions(+), 49 deletions(-) delete mode 100644 LayoutTests/http/tests/cache/cancel-during-failure-crash-expected.txt delete mode 100644 LayoutTests/http/tests/cache/cancel-during-failure-crash.html diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog index 9163816..62047d4 100644 --- a/LayoutTests/ChangeLog +++ b/LayoutTests/ChangeLog @@ -1,3 +1,19 @@ +2012-04-23 Sheriff Bot + + 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 https://bugs.webkit.org/show_bug.cgi?id=84649 diff --git a/LayoutTests/http/tests/cache/cancel-during-failure-crash-expected.txt b/LayoutTests/http/tests/cache/cancel-during-failure-crash-expected.txt deleted file mode 100644 index 7ef22e9..0000000 --- a/LayoutTests/http/tests/cache/cancel-during-failure-crash-expected.txt +++ /dev/null @@ -1 +0,0 @@ -PASS diff --git a/LayoutTests/http/tests/cache/cancel-during-failure-crash.html b/LayoutTests/http/tests/cache/cancel-during-failure-crash.html deleted file mode 100644 index 226dfe8..0000000 --- a/LayoutTests/http/tests/cache/cancel-during-failure-crash.html +++ /dev/null @@ -1,22 +0,0 @@ - - - - - diff --git a/LayoutTests/platform/chromium-mac/security/block-test-expected.txt b/LayoutTests/platform/chromium-mac/security/block-test-expected.txt index ef6dc52..820e7fd 100644 --- a/LayoutTests/platform/chromium-mac/security/block-test-expected.txt +++ b/LayoutTests/platform/chromium-mac/security/block-test-expected.txt @@ -1,7 +1,7 @@ http://255.255.255.255:1/test.jpg - willSendRequest redirectResponse (null) - didFinishLoading -http://255.255.255.255:7/test.jpg - willSendRequest redirectResponse (null) http://255.255.255.255:1/test.jpg - didFailLoadingWithError: +http://255.255.255.255:7/test.jpg - willSendRequest redirectResponse (null) http://255.255.255.255:7/test.jpg - didFailLoadingWithError: http://255.255.255.255:9/test.jpg - willSendRequest redirectResponse (null) http://255.255.255.255:9/test.jpg - didFailLoadingWithError: diff --git a/LayoutTests/platform/chromium-win/security/block-test-expected.txt b/LayoutTests/platform/chromium-win/security/block-test-expected.txt index ebdc2b2..9cacbce 100644 --- a/LayoutTests/platform/chromium-win/security/block-test-expected.txt +++ b/LayoutTests/platform/chromium-win/security/block-test-expected.txt @@ -1,7 +1,7 @@ http://255.255.255.255:1/test.jpg - willSendRequest redirectResponse (null) - didFinishLoading -http://255.255.255.255:7/test.jpg - willSendRequest redirectResponse (null) http://255.255.255.255:1/test.jpg - didFailLoadingWithError: +http://255.255.255.255:7/test.jpg - willSendRequest redirectResponse (null) http://255.255.255.255:7/test.jpg - didFailLoadingWithError: http://255.255.255.255:9/test.jpg - willSendRequest redirectResponse (null) http://255.255.255.255:9/test.jpg - didFailLoadingWithError: diff --git a/LayoutTests/platform/gtk/security/block-test-expected.txt b/LayoutTests/platform/gtk/security/block-test-expected.txt index 5483ea4..7dbd297 100644 --- a/LayoutTests/platform/gtk/security/block-test-expected.txt +++ b/LayoutTests/platform/gtk/security/block-test-expected.txt @@ -1,7 +1,7 @@ http://255.255.255.255:1/test.jpg - willSendRequest redirectResponse (null) - didFinishLoading -http://255.255.255.255:7/test.jpg - willSendRequest redirectResponse (null) http://255.255.255.255:1/test.jpg - didFailLoadingWithError: +http://255.255.255.255:7/test.jpg - willSendRequest redirectResponse (null) http://255.255.255.255:7/test.jpg - didFailLoadingWithError: http://255.255.255.255:9/test.jpg - willSendRequest redirectResponse (null) http://255.255.255.255:9/test.jpg - didFailLoadingWithError: diff --git a/LayoutTests/platform/mac/security/block-test-expected.txt b/LayoutTests/platform/mac/security/block-test-expected.txt index 1197e45..296c4ba 100644 --- a/LayoutTests/platform/mac/security/block-test-expected.txt +++ b/LayoutTests/platform/mac/security/block-test-expected.txt @@ -1,7 +1,7 @@ http://255.255.255.255:1/test.jpg - willSendRequest redirectResponse (null) - didFinishLoading -http://255.255.255.255:7/test.jpg - willSendRequest redirectResponse (null) http://255.255.255.255:1/test.jpg - didFailLoadingWithError: +http://255.255.255.255:7/test.jpg - willSendRequest redirectResponse (null) http://255.255.255.255:7/test.jpg - didFailLoadingWithError: http://255.255.255.255:9/test.jpg - willSendRequest redirectResponse (null) http://255.255.255.255:9/test.jpg - didFailLoadingWithError: diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog index 6664d4d..46765e0 100644 --- a/Source/WebCore/ChangeLog +++ b/Source/WebCore/ChangeLog @@ -1,3 +1,18 @@ +2012-04-23 Sheriff Bot + + 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 https://bugs.webkit.org/show_bug.cgi?id=84649 diff --git a/Source/WebCore/loader/SubresourceLoader.cpp b/Source/WebCore/loader/SubresourceLoader.cpp index feb6e8d..76583e8 100644 --- a/Source/WebCore/loader/SubresourceLoader.cpp +++ b/Source/WebCore/loader/SubresourceLoader.cpp @@ -275,10 +275,6 @@ void SubresourceLoader::didFinishLoading(double finishTime) 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 @@ void SubresourceLoader::didFail(const ResourceError& error) 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()); - - RefPtr protect(this); - m_state = Finishing; - if (m_resource->resourceToRevalidate()) - memoryCache()->revalidationFailed(m_resource); - memoryCache()->remove(m_resource); - } - m_requestCountTracker.clear(); - m_document->cachedResourceLoader()->loadDone(); + if (m_state != Initialized) + return; + ASSERT(!reachedTerminalState()); + LOG(ResourceLoading, "Cancelled load of '%s'.\n", m_resource->url().string().latin1().data()); + + RefPtr 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); } -- 1.8.3.1