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

[cblu]

The following commit has been merged in the debian/unstable branch:
commit 7c2ad557512b8ccda25ec9e4ad7372090511b200
Author: cblu <cblu at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Jan 31 00:13:36 2003 +0000

    	Backed out my fix for 3161102. Richard and I found problems the fix. 3161102 turns out to not be an issue.
    
            Reviewed by rjw.
    
            * History.subproj/WebHistoryItem.m:
            (+[WebHistoryItem _releaseAllPendingPageCaches]):
            * WebView.subproj/WebHTMLView.m:
            (-[WebHTMLView windowWillClose:]):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@3514 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 625730b..f6c02a0 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,5 +1,16 @@
 2003-01-30  Chris Blumenberg  <cblu at apple.com>
 
+	Backed out my fix for 3161102. Richard and I found problems the fix. 3161102 turns out to not be an issue.
+
+        Reviewed by rjw.
+
+        * History.subproj/WebHistoryItem.m:
+        (+[WebHistoryItem _releaseAllPendingPageCaches]):
+        * WebView.subproj/WebHTMLView.m:
+        (-[WebHTMLView windowWillClose:]):
+
+2003-01-30  Chris Blumenberg  <cblu at apple.com>
+
 	Fixed: 3161102 - Avoid retain cycles by destroying plug-ins in the page cache before dealloc
 
         Reviewed by rjw.
diff --git a/WebKit/History.subproj/WebHistoryItem.m b/WebKit/History.subproj/WebHistoryItem.m
index 92baf13..8bfe522 100644
--- a/WebKit/History.subproj/WebHistoryItem.m
+++ b/WebKit/History.subproj/WebHistoryItem.m
@@ -6,11 +6,9 @@
 #import <WebKit/WebHistoryItemPrivate.h>
 
 #import <WebKit/WebFramePrivate.h>
-#import <WebKit/WebHTMLViewPrivate.h>
 #import <WebKit/WebIconDatabase.h>
 #import <WebKit/WebIconLoader.h>
 #import <WebKit/WebKitLogging.h>
-#import <WebKit/WebPluginController.h>
 
 #import <WebFoundation/WebAssertions.h>
 #import <WebFoundation/WebNSDictionaryExtras.h>
@@ -506,20 +504,6 @@ static NSTimer *_pageCacheReleaseTimer = nil;
 {
     LOG (PageCache, "releasing %d items\n", [_pendingPageCacheToRelease count]);
     [WebHistoryItem _invalidateReleaseTimer];
-
-    NSEnumerator *enumerator = [_pendingPageCacheToRelease objectEnumerator];
-    NSDictionary *cache;
-
-    // Plug-ins could retain anything including the WebHTMLView or the window.
-    // To avoid any possible retain cycle, call destroyPlugin on all the plug-ins
-    // instead of completely relying on dealloc.
-    while ((cache = [enumerator nextObject]) != nil) {
-        WebHTMLView *view = [cache objectForKey:@"WebKitDocumentView"];
-        if ([view isKindOfClass:[WebHTMLView class]]) {
-            [[view _pluginController] destroyAllPlugins];
-        }
-    }
-    
     [_pendingPageCacheToRelease removeAllObjects];
 }
 
diff --git a/WebKit/WebView.subproj/WebHTMLView.m b/WebKit/WebView.subproj/WebHTMLView.m
index 29e8d40..f635178 100644
--- a/WebKit/WebView.subproj/WebHTMLView.m
+++ b/WebKit/WebView.subproj/WebHTMLView.m
@@ -5,7 +5,6 @@
 
 #import <WebKit/WebHTMLView.h>
 
-#import <WebKit/WebBackForwardList.h>
 #import <WebKit/WebBridge.h>
 #import <WebKit/WebClipView.h>
 #import <WebKit/WebContextMenuDelegate.h>
@@ -599,10 +598,6 @@
 
 - (void)windowWillClose:(NSNotification *)notification
 {
-    // Plug-ins could retain anything including the WebHTMLView or the window.
-    // To avoid any possible retain cycle, call destroyPlugin on all the plug-ins
-    // including the ones in the page cache instead of completely relying on dealloc.
-    [[[self _controller] backForwardList] clearPageCache];
     [[self _pluginController] destroyAllPlugins];
 }
 

-- 
WebKit Debian packaging