[webkit-changes] [91320] trunk/Source/WebCore

Tue, 19 Jul 2011 16:18:48 -0700

Title: [91320] trunk/Source/WebCore
Revision
91320
Author
[email protected]
Date
2011-07-19 16:18:41 -0700 (Tue, 19 Jul 2011)

Log Message

GTK + QT build fix.

Rubber-stamped by Daniel Bates and Alexey Proskuryakov.

* 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 (91319 => 91320)


--- trunk/Source/WebCore/ChangeLog	2011-07-19 23:14:30 UTC (rev 91319)
+++ trunk/Source/WebCore/ChangeLog	2011-07-19 23:18:41 UTC (rev 91320)
@@ -1,3 +1,21 @@
+2011-07-19  Jessie Berlin  <[email protected]>
+
+        GTK + QT build fix.
+
+        Rubber-stamped by Daniel Bates and Alexey Proskuryakov.
+
+        * 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):
+
 2011-07-19  Chris Rogers  <[email protected]>
 
         Fix web audio compile on mac port

Modified: trunk/Source/WebCore/loader/ResourceLoader.cpp (91319 => 91320)


--- trunk/Source/WebCore/loader/ResourceLoader.cpp	2011-07-19 23:14:30 UTC (rev 91319)
+++ trunk/Source/WebCore/loader/ResourceLoader.cpp	2011-07-19 23:18:41 UTC (rev 91320)
@@ -224,8 +224,10 @@
 
 void ResourceLoader::willSendRequest(ResourceRequest& request, const ResourceResponse& redirectResponse)
 {
+#if ENABLE(OFFLINE_WEB_APPLICATIONS)
     if (!fastMallocSize(documentLoader()->applicationCacheHost()))
         CRASH();
+#endif
     if (!fastMallocSize(documentLoader()->frame()))
         CRASH();
     // Protect this in this delegate method since the additional processing can do
@@ -250,16 +252,20 @@
 
 void ResourceLoader::didSendData(unsigned long long, unsigned long long)
 {
+#if ENABLE(OFFLINE_WEB_APPLICATIONS)
     if (!fastMallocSize(documentLoader()->applicationCacheHost()))
         CRASH();
+#endif
     if (!fastMallocSize(documentLoader()->frame()))
         CRASH();
 }
 
 void ResourceLoader::didReceiveResponse(const ResourceResponse& r)
 {
+#if ENABLE(OFFLINE_WEB_APPLICATIONS)
     if (!fastMallocSize(documentLoader()->applicationCacheHost()))
         CRASH();
+#endif
     if (!fastMallocSize(documentLoader()->frame()))
         CRASH();
     ASSERT(!m_reachedTerminalState);
@@ -279,8 +285,10 @@
 
 void ResourceLoader::didReceiveData(const char* data, int length, long long encodedDataLength, bool allAtOnce)
 {
+#if ENABLE(OFFLINE_WEB_APPLICATIONS)
     if (!m_cancelled && !fastMallocSize(documentLoader()->applicationCacheHost()))
         CRASH();
+#endif
     if (!m_cancelled && !fastMallocSize(documentLoader()->frame()))
         CRASH();
     // The following assertions are not quite valid here, since a subclass
@@ -457,8 +465,10 @@
 
 void ResourceLoader::didFinishLoading(ResourceHandle*, double finishTime)
 {
+#if ENABLE(OFFLINE_WEB_APPLICATIONS)
     if (!fastMallocSize(documentLoader()->applicationCacheHost()))
         CRASH();
+#endif
     if (!fastMallocSize(documentLoader()->frame()))
         CRASH();
     didFinishLoading(finishTime);
@@ -466,8 +476,10 @@
 
 void ResourceLoader::didFail(ResourceHandle*, const ResourceError& error)
 {
+#if ENABLE(OFFLINE_WEB_APPLICATIONS)
     if (!fastMallocSize(documentLoader()->applicationCacheHost()))
         CRASH();
+#endif
     if (!fastMallocSize(documentLoader()->frame()))
         CRASH();
 #if ENABLE(OFFLINE_WEB_APPLICATIONS)
@@ -479,8 +491,10 @@
 
 void ResourceLoader::wasBlocked(ResourceHandle*)
 {
+#if ENABLE(OFFLINE_WEB_APPLICATIONS)
     if (!fastMallocSize(documentLoader()->applicationCacheHost()))
         CRASH();
+#endif
     if (!fastMallocSize(documentLoader()->frame()))
         CRASH();
     didFail(blockedError());
@@ -488,8 +502,10 @@
 
 void ResourceLoader::cannotShowURL(ResourceHandle*)
 {
+#if ENABLE(OFFLINE_WEB_APPLICATIONS)
     if (!fastMallocSize(documentLoader()->applicationCacheHost()))
         CRASH();
+#endif
     if (!fastMallocSize(documentLoader()->frame()))
         CRASH();
     didFail(cannotShowURLError());
@@ -497,8 +513,10 @@
 
 bool ResourceLoader::shouldUseCredentialStorage()
 {
+#if ENABLE(OFFLINE_WEB_APPLICATIONS)
     if (!fastMallocSize(documentLoader()->applicationCacheHost()))
         CRASH();
+#endif
     if (!fastMallocSize(documentLoader()->frame()))
         CRASH();
     RefPtr<ResourceLoader> protector(this);
@@ -536,8 +554,10 @@
 
 void ResourceLoader::willCacheResponse(ResourceHandle*, CacheStoragePolicy& policy)
 {
+#if ENABLE(OFFLINE_WEB_APPLICATIONS)
     if (!fastMallocSize(documentLoader()->applicationCacheHost()))
         CRASH();
+#endif
     if (!fastMallocSize(documentLoader()->frame()))
         CRASH();
     // <rdar://problem/7249553> - There are reports of crashes with this method being called

_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes

Reply via email to