[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 6c9e308a58101d27296957bdb0bf4085c233edab
Author: rjw <rjw at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Oct 24 23:10:05 2003 +0000

    WebKit:
    	Fixed 3425358.  Don't try to create page cache for pages that
    	have a nil view().
    
            Reviewed by Hyatt.
    
            * WebView.subproj/WebFrame.m:
            (-[WebFrame _createPageCacheForItem:]):
            (-[WebFrame _setState:]):
    
    WebCore:
    	Fixed 3425358.  Don't try to create page cache for pages that
    	have a nil view().
    
            Reviewed by Hyatt.
    
            * kwq/WebCoreBridge.mm:
            (-[WebCoreBridge saveDocumentToPageCache]):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@5258 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 5b24276..9ed4f17 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,13 @@
+2003-10-24  Richard Williamson   <rjw at apple.com>
+
+	Fixed 3425358.  Don't try to create page cache for pages that
+	have a nil view().
+
+        Reviewed by Hyatt.
+
+        * kwq/WebCoreBridge.mm:
+        (-[WebCoreBridge saveDocumentToPageCache]):
+
 2003-10-24  David Hyatt  <hyatt at apple.com>
 
 	Fix for 3133375, the minwidth computation for pres is wrong.  There were a couple of bugs here.
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 5b24276..9ed4f17 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,13 @@
+2003-10-24  Richard Williamson   <rjw at apple.com>
+
+	Fixed 3425358.  Don't try to create page cache for pages that
+	have a nil view().
+
+        Reviewed by Hyatt.
+
+        * kwq/WebCoreBridge.mm:
+        (-[WebCoreBridge saveDocumentToPageCache]):
+
 2003-10-24  David Hyatt  <hyatt at apple.com>
 
 	Fix for 3133375, the minwidth computation for pres is wrong.  There were a couple of bugs here.
diff --git a/WebCore/kwq/WebCoreBridge.mm b/WebCore/kwq/WebCoreBridge.mm
index 29a2a17..0a55762 100644
--- a/WebCore/kwq/WebCoreBridge.mm
+++ b/WebCore/kwq/WebCoreBridge.mm
@@ -271,6 +271,9 @@ static bool initializedObjectCacheSize = FALSE;
         return NO;
     }
     
+    if (!doc->view()) {
+        return NO;
+    }
     _part->clearTimers();
 
     SavedProperties *windowProperties = new SavedProperties;
diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 3130506..cc23ec9 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,14 @@
+2003-10-24  Richard Williamson   <rjw at apple.com>
+
+	Fixed 3425358.  Don't try to create page cache for pages that
+	have a nil view().
+
+        Reviewed by Hyatt.
+
+        * WebView.subproj/WebFrame.m:
+        (-[WebFrame _createPageCacheForItem:]):
+        (-[WebFrame _setState:]):
+
 2003-10-24  Chris Blumenberg  <cblu at apple.com>
 	
 	Fixed: <rdar://problem/3424039>: standalone plug-in content occasionaly redirects to blank page
diff --git a/WebKit/WebView.subproj/WebFrame.m b/WebKit/WebView.subproj/WebFrame.m
index 4307cbe..4491091 100644
--- a/WebKit/WebView.subproj/WebFrame.m
+++ b/WebKit/WebView.subproj/WebFrame.m
@@ -799,17 +799,24 @@ static CFAbsoluteTime _timeOfLastCompletedLoad;
     return _timeOfLastCompletedLoad;
 }
 
-- (void)_createPageCacheForItem:(WebHistoryItem *)item
+- (BOOL)_createPageCacheForItem:(WebHistoryItem *)item
 {
     NSMutableDictionary *pageCache;
 
     [item setHasPageCache: YES];
-    pageCache = [item pageCache];
-    [[self dataSource] _setStoredInPageCache: YES];
-    [pageCache setObject: [NSDate date]  forKey: WebPageCacheEntryDateKey];
-    [pageCache setObject: [self dataSource] forKey: WebPageCacheDataSourceKey];
-    [pageCache setObject: [[self frameView] documentView] forKey: WebPageCacheDocumentViewKey];
-    [_private->bridge saveDocumentToPageCache];
+
+    if (![_private->bridge saveDocumentToPageCache]){
+        [item setHasPageCache: NO];
+        return NO;
+    }
+    else {
+        pageCache = [item pageCache];
+        [[self dataSource] _setStoredInPageCache: YES];
+        [pageCache setObject: [NSDate date]  forKey: WebPageCacheEntryDateKey];
+        [pageCache setObject: [self dataSource] forKey: WebPageCacheDataSourceKey];
+        [pageCache setObject: [[self frameView] documentView] forKey: WebPageCacheDocumentViewKey];
+    }
+    return YES;
 }
 
 - (void)_setState: (WebFrameState)newState
@@ -857,14 +864,18 @@ static CFAbsoluteTime _timeOfLastCompletedLoad;
             && [[[self dataSource] representation] isKindOfClass: [WebHTMLRepresentation class]])
         {
             if (![item pageCache]){
-                LOG(PageCache, "Saving page to back/forward cache, %@\n", [[self dataSource] _URL]);
 
                 // Add the items to this page's cache.
-                [self _createPageCacheForItem:item];
+                if ([self _createPageCacheForItem:item]) {
+                    LOG(PageCache, "Saving page to back/forward cache, %@\n", [[self dataSource] _URL]);
 
-                // See if any page caches need to be purged after the addition of this
-                // new page cache.
-                [self _purgePageCache];
+                    // See if any page caches need to be purged after the addition of this
+                    // new page cache.
+                    [self _purgePageCache];
+                }
+                else {
+                    LOG(PageCache, "NOT saving page to back/forward cache, unable to create items, %@\n", [[self dataSource] _URL]);
+                }
             }
         }
         else {

-- 
WebKit Debian packaging