[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677

[darin]

The following commit has been merged in the debian/unstable branch:
commit d81b87cf29cd9d882efd838bb2ad699eb8c7b1ba
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Jun 21 17:20:15 2002 +0000

    	* kwq/KWQKloader.mm: (KWQCheckCacheObjectStatus):
    	Handle case of nil object. Add comments. Remove questionable use
    	of floating point abs() to convert always positive int to uint.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@1413 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index 87e7e62..1b64ce7 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,3 +1,9 @@
+2002-06-21  Darin Adler  <darin at apple.com>
+
+	* kwq/KWQKloader.mm: (KWQCheckCacheObjectStatus):
+	Handle case of nil object. Add comments. Remove questionable use
+	of floating point abs() to convert always positive int to uint.
+
 2002-06-20  Darin Adler  <darin at apple.com>
 
 	* kwq/KWQKCharsets.mm: Removed unneeded parts.
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 87e7e62..1b64ce7 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,9 @@
+2002-06-21  Darin Adler  <darin at apple.com>
+
+	* kwq/KWQKloader.mm: (KWQCheckCacheObjectStatus):
+	Handle case of nil object. Add comments. Remove questionable use
+	of floating point abs() to convert always positive int to uint.
+
 2002-06-20  Darin Adler  <darin at apple.com>
 
 	* kwq/KWQKCharsets.mm: Removed unneeded parts.
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 87e7e62..1b64ce7 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,9 @@
+2002-06-21  Darin Adler  <darin at apple.com>
+
+	* kwq/KWQKloader.mm: (KWQCheckCacheObjectStatus):
+	Handle case of nil object. Add comments. Remove questionable use
+	of floating point abs() to convert always positive int to uint.
+
 2002-06-20  Darin Adler  <darin at apple.com>
 
 	* kwq/KWQKCharsets.mm: Removed unneeded parts.
diff --git a/WebCore/kwq/KWQKloader.mm b/WebCore/kwq/KWQKloader.mm
index ae4be7f..258e7aa 100644
--- a/WebCore/kwq/KWQKloader.mm
+++ b/WebCore/kwq/KWQKloader.mm
@@ -104,12 +104,25 @@ void KWQServeRequest(Loader *loader, Request *request, TransferJob *job)
 
 void KWQCheckCacheObjectStatus(DocLoader *loader, CachedObject *cachedObject)
 {
-    CachedObject::Status status = cachedObject->status();
-    if (status == CachedObject::Persistent || status == CachedObject::Cached || status == CachedObject::Uncacheable) {
-        WebCoreBridge *bridge = ((KHTMLPart *)loader->part())->impl->getBridge();
-        NSURL *nsURL = [[NSURL alloc] initWithString:QSTRING_TO_NSSTRING(cachedObject->url().string())];
-        unsigned size = abs(cachedObject->size());
-        [bridge objectLoadedFromCache:nsURL size:size];
-        [nsURL release];
+    // Return from the function for objects that we didn't load from the cache.
+    if (!cachedObject)
+        return;
+    switch (cachedObject->status()) {
+    case CachedObject::Persistent:
+    case CachedObject::Cached:
+    case CachedObject::Uncacheable:
+        break;
+    case CachedObject::NotCached:
+    case CachedObject::Unknown:
+    case CachedObject::New:
+    case CachedObject::Pending:
+        return;
     }
+    
+    // Notify the caller that we "loaded".
+    WebCoreBridge *bridge = ((KHTMLPart *)loader->part())->impl->getBridge();
+    NSURL *nsURL = [[NSURL alloc] initWithString:cachedObject->url().string().getNSString()];
+    // FIXME: cachedObject-size() is not the correct size, see Radar 2965269
+    [bridge objectLoadedFromCache:nsURL size:cachedObject->size()];
+    [nsURL release];
 }
\ No newline at end of file
diff --git a/WebCore/kwq/KWQLoader.mm b/WebCore/kwq/KWQLoader.mm
index ae4be7f..258e7aa 100644
--- a/WebCore/kwq/KWQLoader.mm
+++ b/WebCore/kwq/KWQLoader.mm
@@ -104,12 +104,25 @@ void KWQServeRequest(Loader *loader, Request *request, TransferJob *job)
 
 void KWQCheckCacheObjectStatus(DocLoader *loader, CachedObject *cachedObject)
 {
-    CachedObject::Status status = cachedObject->status();
-    if (status == CachedObject::Persistent || status == CachedObject::Cached || status == CachedObject::Uncacheable) {
-        WebCoreBridge *bridge = ((KHTMLPart *)loader->part())->impl->getBridge();
-        NSURL *nsURL = [[NSURL alloc] initWithString:QSTRING_TO_NSSTRING(cachedObject->url().string())];
-        unsigned size = abs(cachedObject->size());
-        [bridge objectLoadedFromCache:nsURL size:size];
-        [nsURL release];
+    // Return from the function for objects that we didn't load from the cache.
+    if (!cachedObject)
+        return;
+    switch (cachedObject->status()) {
+    case CachedObject::Persistent:
+    case CachedObject::Cached:
+    case CachedObject::Uncacheable:
+        break;
+    case CachedObject::NotCached:
+    case CachedObject::Unknown:
+    case CachedObject::New:
+    case CachedObject::Pending:
+        return;
     }
+    
+    // Notify the caller that we "loaded".
+    WebCoreBridge *bridge = ((KHTMLPart *)loader->part())->impl->getBridge();
+    NSURL *nsURL = [[NSURL alloc] initWithString:cachedObject->url().string().getNSString()];
+    // FIXME: cachedObject-size() is not the correct size, see Radar 2965269
+    [bridge objectLoadedFromCache:nsURL size:cachedObject->size()];
+    [nsURL release];
 }
\ No newline at end of file
diff --git a/WebCore/kwq/KWQLoaderImpl.mm b/WebCore/kwq/KWQLoaderImpl.mm
index ae4be7f..258e7aa 100644
--- a/WebCore/kwq/KWQLoaderImpl.mm
+++ b/WebCore/kwq/KWQLoaderImpl.mm
@@ -104,12 +104,25 @@ void KWQServeRequest(Loader *loader, Request *request, TransferJob *job)
 
 void KWQCheckCacheObjectStatus(DocLoader *loader, CachedObject *cachedObject)
 {
-    CachedObject::Status status = cachedObject->status();
-    if (status == CachedObject::Persistent || status == CachedObject::Cached || status == CachedObject::Uncacheable) {
-        WebCoreBridge *bridge = ((KHTMLPart *)loader->part())->impl->getBridge();
-        NSURL *nsURL = [[NSURL alloc] initWithString:QSTRING_TO_NSSTRING(cachedObject->url().string())];
-        unsigned size = abs(cachedObject->size());
-        [bridge objectLoadedFromCache:nsURL size:size];
-        [nsURL release];
+    // Return from the function for objects that we didn't load from the cache.
+    if (!cachedObject)
+        return;
+    switch (cachedObject->status()) {
+    case CachedObject::Persistent:
+    case CachedObject::Cached:
+    case CachedObject::Uncacheable:
+        break;
+    case CachedObject::NotCached:
+    case CachedObject::Unknown:
+    case CachedObject::New:
+    case CachedObject::Pending:
+        return;
     }
+    
+    // Notify the caller that we "loaded".
+    WebCoreBridge *bridge = ((KHTMLPart *)loader->part())->impl->getBridge();
+    NSURL *nsURL = [[NSURL alloc] initWithString:cachedObject->url().string().getNSString()];
+    // FIXME: cachedObject-size() is not the correct size, see Radar 2965269
+    [bridge objectLoadedFromCache:nsURL size:cachedObject->size()];
+    [nsURL release];
 }
\ No newline at end of file

-- 
WebKit Debian packaging