[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 7fa5bd4bf62eec9c13ea2162c255867cad8032be
Author: rjw <rjw at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Apr 5 21:15:38 2002 +0000

            Back out some changes to lazily dealloc frame.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@976 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 09c4fc6..248155c 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,5 +1,11 @@
 2002-04-05  Richard Williamson  <rjw at apple.com>
 
+        Back out some changes to lazily dealloc frame.
+        
+	* WebView.subproj/IFWebFrame.mm: (-[IFWebFrame release]):
+
+2002-04-05  Richard Williamson  <rjw at apple.com>
+
         New method on controller to find a frame of a particular name
         anywhere in the frame hierarchy.
         
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index 09c4fc6..248155c 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,5 +1,11 @@
 2002-04-05  Richard Williamson  <rjw at apple.com>
 
+        Back out some changes to lazily dealloc frame.
+        
+	* WebView.subproj/IFWebFrame.mm: (-[IFWebFrame release]):
+
+2002-04-05  Richard Williamson  <rjw at apple.com>
+
         New method on controller to find a frame of a particular name
         anywhere in the frame hierarchy.
         
diff --git a/WebKit/WebView.subproj/IFWebFrame.mm b/WebKit/WebView.subproj/IFWebFrame.mm
index c9089af..9440b52 100644
--- a/WebKit/WebView.subproj/IFWebFrame.mm
+++ b/WebKit/WebView.subproj/IFWebFrame.mm
@@ -76,12 +76,14 @@
 }
 
 - (oneway void)release {
+#ifdef THIS_MAY_BE_BAD
     if ([self retainCount] == 1){
         _IFFrameHolder *ch = [[[_IFFrameHolder alloc] initWithObject: self] autorelease];
         [self stopLoading];
         [NSTimer scheduledTimerWithTimeInterval:1.0 target:ch selector: @selector(_checkReadyToDealloc:) userInfo: nil repeats:FALSE];
         return;
     }
+#endif
     [super release];
 }
 
diff --git a/WebKit/WebView.subproj/WebFrame.m b/WebKit/WebView.subproj/WebFrame.m
index c9089af..9440b52 100644
--- a/WebKit/WebView.subproj/WebFrame.m
+++ b/WebKit/WebView.subproj/WebFrame.m
@@ -76,12 +76,14 @@
 }
 
 - (oneway void)release {
+#ifdef THIS_MAY_BE_BAD
     if ([self retainCount] == 1){
         _IFFrameHolder *ch = [[[_IFFrameHolder alloc] initWithObject: self] autorelease];
         [self stopLoading];
         [NSTimer scheduledTimerWithTimeInterval:1.0 target:ch selector: @selector(_checkReadyToDealloc:) userInfo: nil repeats:FALSE];
         return;
     }
+#endif
     [super release];
 }
 

-- 
WebKit Debian packaging