Title: [114188] trunk/Source/WebCore
- Revision
- 114188
- Author
- jber...@webkit.org
- Date
- 2012-04-13 17:34:19 -0700 (Fri, 13 Apr 2012)
Log Message
Remove the calls to CRASH() from ResourceLoader.cpp.
https://bugs.webkit.org/show_bug.cgi?id=83962
Reviewed by Alexey Proskuryakov.
They were added in r91316 to aid debugging for the issue fixed in r105556 and r106130.
* loader/ResourceLoader.cpp:
(WebCore::ResourceLoader::willSendRequest):
(WebCore::ResourceLoader::didSendData):
(WebCore::ResourceLoader::didReceiveResponse):
(WebCore::ResourceLoader::didReceiveData):
(WebCore::ResourceLoader::didFinishLoading):
(WebCore::ResourceLoader::didFail):
(WebCore::ResourceLoader::wasBlocked):
(WebCore::ResourceLoader::cannotShowURL):
(WebCore::ResourceLoader::shouldUseCredentialStorage):
(WebCore::ResourceLoader::willCacheResponse):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (114187 => 114188)
--- trunk/Source/WebCore/ChangeLog 2012-04-14 00:33:09 UTC (rev 114187)
+++ trunk/Source/WebCore/ChangeLog 2012-04-14 00:34:19 UTC (rev 114188)
@@ -1,3 +1,24 @@
+2012-04-13 Jessie Berlin <jber...@apple.com>
+
+ Remove the calls to CRASH() from ResourceLoader.cpp.
+ https://bugs.webkit.org/show_bug.cgi?id=83962
+
+ Reviewed by Alexey Proskuryakov.
+
+ They were added in r91316 to aid debugging for the issue fixed in r105556 and r106130.
+
+ * loader/ResourceLoader.cpp:
+ (WebCore::ResourceLoader::willSendRequest):
+ (WebCore::ResourceLoader::didSendData):
+ (WebCore::ResourceLoader::didReceiveResponse):
+ (WebCore::ResourceLoader::didReceiveData):
+ (WebCore::ResourceLoader::didFinishLoading):
+ (WebCore::ResourceLoader::didFail):
+ (WebCore::ResourceLoader::wasBlocked):
+ (WebCore::ResourceLoader::cannotShowURL):
+ (WebCore::ResourceLoader::shouldUseCredentialStorage):
+ (WebCore::ResourceLoader::willCacheResponse):
+
2012-04-13 Xiaomei Ji <x...@chromium.org>
REGRESSION(r102190) [chromium] text rendering (font and font size) in some Arabic/Persian page is wrong
Modified: trunk/Source/WebCore/loader/ResourceLoader.cpp (114187 => 114188)
--- trunk/Source/WebCore/loader/ResourceLoader.cpp 2012-04-14 00:33:09 UTC (rev 114187)
+++ trunk/Source/WebCore/loader/ResourceLoader.cpp 2012-04-14 00:34:19 UTC (rev 114188)
@@ -216,10 +216,6 @@
void ResourceLoader::willSendRequest(ResourceRequest& request, const ResourceResponse& redirectResponse)
{
- if (!fastMallocSize(documentLoader()->applicationCacheHost()))
- CRASH();
- if (!fastMallocSize(documentLoader()->frame()))
- CRASH();
// Protect this in this delegate method since the additional processing can do
// anything including possibly derefing this; one example of this is Radar 3266216.
RefPtr<ResourceLoader> protector(this);
@@ -242,18 +238,10 @@
void ResourceLoader::didSendData(unsigned long long, unsigned long long)
{
- if (!fastMallocSize(documentLoader()->applicationCacheHost()))
- CRASH();
- if (!fastMallocSize(documentLoader()->frame()))
- CRASH();
}
void ResourceLoader::didReceiveResponse(const ResourceResponse& r)
{
- if (!fastMallocSize(documentLoader()->applicationCacheHost()))
- CRASH();
- if (!fastMallocSize(documentLoader()->frame()))
- CRASH();
ASSERT(!m_reachedTerminalState);
// Protect this in this delegate method since the additional processing can do
@@ -271,10 +259,6 @@
void ResourceLoader::didReceiveData(const char* data, int length, long long encodedDataLength, bool allAtOnce)
{
- if (!m_cancelled && !fastMallocSize(documentLoader()->applicationCacheHost()))
- CRASH();
- if (!m_cancelled && !fastMallocSize(documentLoader()->frame()))
- CRASH();
// The following assertions are not quite valid here, since a subclass
// might override didReceiveData in a way that invalidates them. This
// happens with the steps listed in 3266216
@@ -445,19 +429,11 @@
void ResourceLoader::didFinishLoading(ResourceHandle*, double finishTime)
{
- if (!fastMallocSize(documentLoader()->applicationCacheHost()))
- CRASH();
- if (!fastMallocSize(documentLoader()->frame()))
- CRASH();
didFinishLoading(finishTime);
}
void ResourceLoader::didFail(ResourceHandle*, const ResourceError& error)
{
- if (!fastMallocSize(documentLoader()->applicationCacheHost()))
- CRASH();
- if (!fastMallocSize(documentLoader()->frame()))
- CRASH();
if (documentLoader()->applicationCacheHost()->maybeLoadFallbackForError(this, error))
return;
didFail(error);
@@ -465,29 +441,16 @@
void ResourceLoader::wasBlocked(ResourceHandle*)
{
- if (!fastMallocSize(documentLoader()->applicationCacheHost()))
- CRASH();
- if (!fastMallocSize(documentLoader()->frame()))
- CRASH();
didFail(blockedError());
}
void ResourceLoader::cannotShowURL(ResourceHandle*)
{
- if (!fastMallocSize(documentLoader()->applicationCacheHost()))
- CRASH();
- if (!fastMallocSize(documentLoader()->frame()))
- CRASH();
didFail(cannotShowURLError());
}
bool ResourceLoader::shouldUseCredentialStorage()
{
- if (!fastMallocSize(documentLoader()->applicationCacheHost()))
- CRASH();
- if (!fastMallocSize(documentLoader()->frame()))
- CRASH();
-
if (m_options.allowCredentials == DoNotAllowStoredCredentials)
return false;
@@ -541,10 +504,6 @@
void ResourceLoader::willCacheResponse(ResourceHandle*, CacheStoragePolicy& policy)
{
- if (!fastMallocSize(documentLoader()->applicationCacheHost()))
- CRASH();
- if (!fastMallocSize(documentLoader()->frame()))
- CRASH();
// <rdar://problem/7249553> - There are reports of crashes with this method being called
// with a null m_frame->settings(), which can only happen if the frame doesn't have a page.
// Sadly we have no reproducible cases of this.
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
