[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 85f94d17fd4c7f4cea01d8816fac2b7c2edfbd63
Author: rjw <rjw at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Mar 29 03:29:12 2002 +0000

            Fixed big leak of any document that had a frame or iframe.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@886 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 6c23478..aca16d8 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,4 +1,12 @@
 2002-03-28  Richard Williamson  <rjw at apple.com>
+
+        Fixed big leak of any document that had a frame or iframe.
+        
+	* WebView.subproj/IFWebDataSource.mm: (-[IFWebDataSource retain]):
+	* WebView.subproj/IFWebDataSourcePrivate.mm: (-[IFWebDataSourcePrivate dealloc]),
+	(-[IFWebDataSource _setParent:]):
+
+2002-03-28  Richard Williamson  <rjw at apple.com>
     
         Modified the initial layout policy.
 
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index 6c23478..aca16d8 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,4 +1,12 @@
 2002-03-28  Richard Williamson  <rjw at apple.com>
+
+        Fixed big leak of any document that had a frame or iframe.
+        
+	* WebView.subproj/IFWebDataSource.mm: (-[IFWebDataSource retain]):
+	* WebView.subproj/IFWebDataSourcePrivate.mm: (-[IFWebDataSourcePrivate dealloc]),
+	(-[IFWebDataSource _setParent:]):
+
+2002-03-28  Richard Williamson  <rjw at apple.com>
     
         Modified the initial layout policy.
 
diff --git a/WebKit/WebView.subproj/IFWebDataSource.mm b/WebKit/WebView.subproj/IFWebDataSource.mm
index 6b75c7b..82a8cc9 100644
--- a/WebKit/WebView.subproj/IFWebDataSource.mm
+++ b/WebKit/WebView.subproj/IFWebDataSource.mm
@@ -37,6 +37,11 @@ static id IFWebDataSourceMake(void *url)
     return self;
 }
 
+- retain
+{
+    return [super retain];
+}
+
 - (void)dealloc
 {
     [_dataSourcePrivate release];
diff --git a/WebKit/WebView.subproj/IFWebDataSourcePrivate.mm b/WebKit/WebView.subproj/IFWebDataSourcePrivate.mm
index d9fcefa..ece553c 100644
--- a/WebKit/WebView.subproj/IFWebDataSourcePrivate.mm
+++ b/WebKit/WebView.subproj/IFWebDataSourcePrivate.mm
@@ -35,7 +35,6 @@
     // controller is not retained!  IFWebControllers maintain
     // a reference to the main frame, which in turn refers to it's
     // view and data source.
-    [parent release];
     [frames release];
     [inputURL release];
     [urlHandles release];
@@ -67,7 +66,8 @@
 
 - (void)_setParent: (IFWebDataSource *)p
 {
-    ((IFWebDataSourcePrivate *)_dataSourcePrivate)->parent = [p retain];
+    // Non-retained.
+    ((IFWebDataSourcePrivate *)_dataSourcePrivate)->parent = p;
 }
 
 - (void)_setPrimaryLoadComplete: (BOOL)flag
diff --git a/WebKit/WebView.subproj/WebDataSource.m b/WebKit/WebView.subproj/WebDataSource.m
index 6b75c7b..82a8cc9 100644
--- a/WebKit/WebView.subproj/WebDataSource.m
+++ b/WebKit/WebView.subproj/WebDataSource.m
@@ -37,6 +37,11 @@ static id IFWebDataSourceMake(void *url)
     return self;
 }
 
+- retain
+{
+    return [super retain];
+}
+
 - (void)dealloc
 {
     [_dataSourcePrivate release];
diff --git a/WebKit/WebView.subproj/WebDataSourcePrivate.m b/WebKit/WebView.subproj/WebDataSourcePrivate.m
index d9fcefa..ece553c 100644
--- a/WebKit/WebView.subproj/WebDataSourcePrivate.m
+++ b/WebKit/WebView.subproj/WebDataSourcePrivate.m
@@ -35,7 +35,6 @@
     // controller is not retained!  IFWebControllers maintain
     // a reference to the main frame, which in turn refers to it's
     // view and data source.
-    [parent release];
     [frames release];
     [inputURL release];
     [urlHandles release];
@@ -67,7 +66,8 @@
 
 - (void)_setParent: (IFWebDataSource *)p
 {
-    ((IFWebDataSourcePrivate *)_dataSourcePrivate)->parent = [p retain];
+    // Non-retained.
+    ((IFWebDataSourcePrivate *)_dataSourcePrivate)->parent = p;
 }
 
 - (void)_setPrimaryLoadComplete: (BOOL)flag

-- 
WebKit Debian packaging