Title: [148834] branches/safari-536.30-branch/Source/WebCore
- Revision
- 148834
- Author
- [email protected]
- Date
- 2013-04-21 09:13:36 -0700 (Sun, 21 Apr 2013)
Log Message
Rollout r145656. <rdar://problem/13691099>
Modified Paths
Diff
Modified: branches/safari-536.30-branch/Source/WebCore/ChangeLog (148833 => 148834)
--- branches/safari-536.30-branch/Source/WebCore/ChangeLog 2013-04-21 15:11:32 UTC (rev 148833)
+++ branches/safari-536.30-branch/Source/WebCore/ChangeLog 2013-04-21 16:13:36 UTC (rev 148834)
@@ -1,3 +1,7 @@
+2012-12-13 Lucas Forschler <[email protected]>
+
+ Rollout r145656
+
2013-04-16 Ryosuke Niwa <[email protected]>
Merge r125955.
Modified: branches/safari-536.30-branch/Source/WebCore/loader/SubresourceLoader.cpp (148833 => 148834)
--- branches/safari-536.30-branch/Source/WebCore/loader/SubresourceLoader.cpp 2013-04-21 15:11:32 UTC (rev 148833)
+++ branches/safari-536.30-branch/Source/WebCore/loader/SubresourceLoader.cpp 2013-04-21 16:13:36 UTC (rev 148834)
@@ -214,8 +214,6 @@
void SubresourceLoader::didReceiveData(const char* data, int length, long long encodedDataLength, bool allAtOnce)
{
- if (m_resource->response().httpStatusCode() >= 400 && !m_resource->shouldIgnoreHTTPStatusCodeErrors())
- return;
ASSERT(!m_resource->resourceToRevalidate());
ASSERT(!m_resource->errorOccurred());
ASSERT(m_state == Initialized);
@@ -235,8 +233,8 @@
if (m_resource->response().httpStatusCode() < 400 || m_resource->shouldIgnoreHTTPStatusCodeErrors())
return false;
- m_state = Finishing;
m_resource->error(CachedResource::LoadError);
+ m_state = Finishing;
cancel();
return true;
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
