[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 c9ea3b7cfd9127310e0ed9d7ccf8676368e3e70d
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Mar 29 19:44:57 2002 +0000

    	* src/kwq/KWQKloader.mm: (Cache::getStatistics), (Cache::flushAll):
            Fix both of these to work when cache is not yet allocated.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@898 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index 189aa68..3e74204 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,3 +1,8 @@
+2002-03-29  Darin Adler  <darin at apple.com>
+
+	* src/kwq/KWQKloader.mm: (Cache::getStatistics), (Cache::flushAll):
+        Fix both of these to work when cache is not yet allocated.
+
 2002-03-29  Richard Williamson  <rjw at apple.com>
 
         Hooked up redirect.
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 189aa68..3e74204 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,8 @@
+2002-03-29  Darin Adler  <darin at apple.com>
+
+	* src/kwq/KWQKloader.mm: (Cache::getStatistics), (Cache::flushAll):
+        Fix both of these to work when cache is not yet allocated.
+
 2002-03-29  Richard Williamson  <rjw at apple.com>
 
         Hooked up redirect.
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 189aa68..3e74204 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,8 @@
+2002-03-29  Darin Adler  <darin at apple.com>
+
+	* src/kwq/KWQKloader.mm: (Cache::getStatistics), (Cache::flushAll):
+        Fix both of these to work when cache is not yet allocated.
+
 2002-03-29  Richard Williamson  <rjw at apple.com>
 
         Hooked up redirect.
diff --git a/WebCore/kwq/KWQKloader.mm b/WebCore/kwq/KWQKloader.mm
index f18c965..e73bf57 100644
--- a/WebCore/kwq/KWQKloader.mm
+++ b/WebCore/kwq/KWQKloader.mm
@@ -1755,8 +1755,9 @@ Cache::Statistics Cache::getStatistics()
 {
     Statistics stats;
 
-    init();
-    
+    if (!cache)
+        return stats;
+
     QDictIterator<CachedObject> i(*cache);
     for (i.toFirst(); i.current(); ++i) {
         CachedObject *o = i.current();
@@ -1792,6 +1793,9 @@ Cache::Statistics Cache::getStatistics()
 
 void Cache::flushAll()
 {
+    if (!cache)
+        return;
+
     for (;;) {
         QDictIterator<CachedObject> i(*cache);
         CachedObject *o = i.toFirst();
diff --git a/WebCore/kwq/KWQLoader.mm b/WebCore/kwq/KWQLoader.mm
index f18c965..e73bf57 100644
--- a/WebCore/kwq/KWQLoader.mm
+++ b/WebCore/kwq/KWQLoader.mm
@@ -1755,8 +1755,9 @@ Cache::Statistics Cache::getStatistics()
 {
     Statistics stats;
 
-    init();
-    
+    if (!cache)
+        return stats;
+
     QDictIterator<CachedObject> i(*cache);
     for (i.toFirst(); i.current(); ++i) {
         CachedObject *o = i.current();
@@ -1792,6 +1793,9 @@ Cache::Statistics Cache::getStatistics()
 
 void Cache::flushAll()
 {
+    if (!cache)
+        return;
+
     for (;;) {
         QDictIterator<CachedObject> i(*cache);
         CachedObject *o = i.toFirst();
diff --git a/WebCore/kwq/KWQLoaderImpl.mm b/WebCore/kwq/KWQLoaderImpl.mm
index f18c965..e73bf57 100644
--- a/WebCore/kwq/KWQLoaderImpl.mm
+++ b/WebCore/kwq/KWQLoaderImpl.mm
@@ -1755,8 +1755,9 @@ Cache::Statistics Cache::getStatistics()
 {
     Statistics stats;
 
-    init();
-    
+    if (!cache)
+        return stats;
+
     QDictIterator<CachedObject> i(*cache);
     for (i.toFirst(); i.current(); ++i) {
         CachedObject *o = i.current();
@@ -1792,6 +1793,9 @@ Cache::Statistics Cache::getStatistics()
 
 void Cache::flushAll()
 {
+    if (!cache)
+        return;
+
     for (;;) {
         QDictIterator<CachedObject> i(*cache);
         CachedObject *o = i.toFirst();
diff --git a/WebCore/src/kwq/KWQKloader.mm b/WebCore/src/kwq/KWQKloader.mm
index f18c965..e73bf57 100644
--- a/WebCore/src/kwq/KWQKloader.mm
+++ b/WebCore/src/kwq/KWQKloader.mm
@@ -1755,8 +1755,9 @@ Cache::Statistics Cache::getStatistics()
 {
     Statistics stats;
 
-    init();
-    
+    if (!cache)
+        return stats;
+
     QDictIterator<CachedObject> i(*cache);
     for (i.toFirst(); i.current(); ++i) {
         CachedObject *o = i.current();
@@ -1792,6 +1793,9 @@ Cache::Statistics Cache::getStatistics()
 
 void Cache::flushAll()
 {
+    if (!cache)
+        return;
+
     for (;;) {
         QDictIterator<CachedObject> i(*cache);
         CachedObject *o = i.toFirst();

-- 
WebKit Debian packaging