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

[rjw]

The following commit has been merged in the debian/unstable branch:
commit 09c8cd3788c780be7bee4bfe94efe1ff2bd6248d
Author: rjw <rjw at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Jan 27 22:13:25 2003 +0000

    WebKit:
            Make emptying the page cache synchronous when "Empty Cache"
            is selected from menu.  More bulletproofing to ensure that
            3155781 doesn't happen.
    
            Reviewed by trey.
    
            * History.subproj/WebBackForwardList.m:
            (-[WebBackForwardList clearPageCache]):
    
    WebCore:
            Reviewed by trey.
    
            Added ASSERT trap to help track down non-repro crash reported
            by 3144546.
    
            * kwq/KWQKHTMLPart.mm:
            (KWQKHTMLPart::openURLFromPageCache):
    
            Remove assert that caused 3155781.  We believe this was happening
            because of a delayed release of the page cache after emptying cache
            from "Empty Cache" menu item.
    
            * kwq/KWQPageState.mm:
            (-[KWQPageState dealloc]):
    
    *.lut.h changes are spurious.
    *.c changes are spurious.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@3466 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index c31f0aa..31ed197 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,20 @@
+2003-01-27  Richard Williamson   <rjw at apple.com>
+
+        Reviewed by trey.
+
+        Added ASSERT trap to help track down non-repro crash reported
+        by 3144546.
+        
+        * kwq/KWQKHTMLPart.mm:
+        (KWQKHTMLPart::openURLFromPageCache):
+        
+        Remove assert that caused 3155781.  We believe this was happening
+        because of a delayed release of the page cache after emptying cache
+        from "Empty Cache" menu item.
+        
+        * kwq/KWQPageState.mm:
+        (-[KWQPageState dealloc]):
+
 2003-01-27  David Hyatt  <hyatt at apple.com>
 
 	Fix text dragging so that text inside floats paints when you
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index c31f0aa..31ed197 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,20 @@
+2003-01-27  Richard Williamson   <rjw at apple.com>
+
+        Reviewed by trey.
+
+        Added ASSERT trap to help track down non-repro crash reported
+        by 3144546.
+        
+        * kwq/KWQKHTMLPart.mm:
+        (KWQKHTMLPart::openURLFromPageCache):
+        
+        Remove assert that caused 3155781.  We believe this was happening
+        because of a delayed release of the page cache after emptying cache
+        from "Empty Cache" menu item.
+        
+        * kwq/KWQPageState.mm:
+        (-[KWQPageState dealloc]):
+
 2003-01-27  David Hyatt  <hyatt at apple.com>
 
 	Fix text dragging so that text inside floats paints when you
diff --git a/WebCore/kwq/KWQKHTMLPart.mm b/WebCore/kwq/KWQKHTMLPart.mm
index 5a2cae1..995f9d2 100644
--- a/WebCore/kwq/KWQKHTMLPart.mm
+++ b/WebCore/kwq/KWQKHTMLPart.mm
@@ -575,6 +575,8 @@ void KWQKHTMLPart::openURLFromPageCache(KWQPageState *state)
         d->m_kjsDefaultStatusBarText = QString::null;
     }
 
+    ASSERT (url);
+    
     m_url = *url;
     
     // set the javascript flags according to the current url
diff --git a/WebCore/kwq/KWQPageState.mm b/WebCore/kwq/KWQPageState.mm
index efaba9e..947d90b 100644
--- a/WebCore/kwq/KWQPageState.mm
+++ b/WebCore/kwq/KWQPageState.mm
@@ -105,11 +105,6 @@ using KJS::SavedProperties;
     if (document) {
         KHTMLView *view = document->view();
 
-        // FIXME: We see evidence that view is nil in backtraces
-        // from the field. So we know this assert would sometimes fire.
-        // We check for nil below anyway until we figure out the cause.
-        ASSERT(view);
-        
         KWQKHTMLPart::clearTimers(view);
 
         document->setInPageCache(NO);
diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 4cb6311..4664140 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,14 @@
+2003-01-27  Richard Williamson   <rjw at apple.com>
+
+        Make emptying the page cache synchronous when "Empty Cache"
+        is selected from menu.  More bulletproofing to ensure that
+        3155781 doesn't happen.
+        
+        Reviewed by trey.
+
+        * History.subproj/WebBackForwardList.m:
+        (-[WebBackForwardList clearPageCache]):
+
 2003-01-27  Chris Blumenberg  <cblu at apple.com>
 
 	Fixed: 3156235 - change throttle for plug-in null events to 50 frames per second (when frontmost)
diff --git a/WebKit/History.subproj/WebBackForwardList.m b/WebKit/History.subproj/WebBackForwardList.m
index 1937906..aa072c8 100644
--- a/WebKit/History.subproj/WebBackForwardList.m
+++ b/WebKit/History.subproj/WebBackForwardList.m
@@ -193,6 +193,7 @@
     for (i = 0; i < (int)[_entries count]; i++) {
         [[_entries objectAtIndex:i] setHasPageCache:NO];
     }
+    [WebHistoryItem _releaseAllPendingPageCaches];
 }
 
 static BOOL pageCacheSizeModified = NO;

-- 
WebKit Debian packaging