[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 b1882d0b098a9246c661f5e66a8e37a3577a09c1
Author: rjw <rjw at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sat Feb 16 19:58:47 2002 +0000

    Comments added as reminders to fix frame<->datasource ownership.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@629 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index af1a206..4594bca 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,10 @@
+2002-02-16  Richard Williamson  <rjw at apple.com>
+
+        Reminders to change frame<->datasource ownership cycle.
+        
+	* WebView.subproj/IFWebDataSource.mm: (-[IFWebDataSource setFrame:]),
+	(-[IFWebDataSource frame]):
+
 2002-02-13  Richard Williamson  <rjw at apple.com>
 
     Fixed cleanup.  Should revisit ownership graph.  Cycles may be avoidable.
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index af1a206..4594bca 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,3 +1,10 @@
+2002-02-16  Richard Williamson  <rjw at apple.com>
+
+        Reminders to change frame<->datasource ownership cycle.
+        
+	* WebView.subproj/IFWebDataSource.mm: (-[IFWebDataSource setFrame:]),
+	(-[IFWebDataSource frame]):
+
 2002-02-13  Richard Williamson  <rjw at apple.com>
 
     Fixed cleanup.  Should revisit ownership graph.  Cycles may be avoidable.
diff --git a/WebKit/WebView.subproj/IFWebDataSource.mm b/WebKit/WebView.subproj/IFWebDataSource.mm
index dbacff6..ba3f697 100644
--- a/WebKit/WebView.subproj/IFWebDataSource.mm
+++ b/WebKit/WebView.subproj/IFWebDataSource.mm
@@ -64,7 +64,8 @@
 
 - (void)setFrame: (IFWebFrame *)f
 {
-    // Careful, there is a cycle between IFWebFrame and IFWebDataSource.
+    // FIXME!  Remove.  This back pointer isn't necessary and introduces a
+    // messy cycle between IFWebFrame and IFWebDataSource.
     if (((IFWebDataSourcePrivate *)_dataSourcePrivate)->frame == f)
         return;
         
@@ -78,6 +79,9 @@
 
 - (IFWebFrame *)frame
 {
+    // FIXME!  Implement traversing the frame tree, starting with
+    // the main frame.  That will remove messy frame<->datasource
+    // cycle.
     return ((IFWebDataSourcePrivate *)_dataSourcePrivate)->frame;    
 }
 
diff --git a/WebKit/WebView.subproj/WebDataSource.m b/WebKit/WebView.subproj/WebDataSource.m
index dbacff6..ba3f697 100644
--- a/WebKit/WebView.subproj/WebDataSource.m
+++ b/WebKit/WebView.subproj/WebDataSource.m
@@ -64,7 +64,8 @@
 
 - (void)setFrame: (IFWebFrame *)f
 {
-    // Careful, there is a cycle between IFWebFrame and IFWebDataSource.
+    // FIXME!  Remove.  This back pointer isn't necessary and introduces a
+    // messy cycle between IFWebFrame and IFWebDataSource.
     if (((IFWebDataSourcePrivate *)_dataSourcePrivate)->frame == f)
         return;
         
@@ -78,6 +79,9 @@
 
 - (IFWebFrame *)frame
 {
+    // FIXME!  Implement traversing the frame tree, starting with
+    // the main frame.  That will remove messy frame<->datasource
+    // cycle.
     return ((IFWebDataSourcePrivate *)_dataSourcePrivate)->frame;    
 }
 

-- 
WebKit Debian packaging