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

[darin]

The following commit has been merged in the debian/unstable branch:
commit d6f9788b95be56a12a9b6fd37f4ebc3025257c27
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Oct 10 05:33:04 2002 +0000

    	- fixed 3072015 -- REGRESSION: frames multiply endlessly
    
            * WebCoreSupport.subproj/WebBridge.m: (-[WebBridge setFrame:]):
    	Remove code that sets the parent from here, because it's too early, always nil.
            * WebView.subproj/WebFramePrivate.m: (-[WebFrame _addChild:]):
    	Do it here instead.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@2296 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index bb767ac..dd877ec 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,12 @@
+2002-10-10  Darin Adler  <darin at apple.com>
+
+	- fixed 3072015 -- REGRESSION: frames multiply endlessly
+
+        * WebCoreSupport.subproj/WebBridge.m: (-[WebBridge setFrame:]):
+	Remove code that sets the parent from here, because it's too early, always nil.
+        * WebView.subproj/WebFramePrivate.m: (-[WebFrame _addChild:]):
+	Do it here instead.
+
 2002-10-09  Richard Williamson   <rjw at apple.com>
 
         * WebCoreSupport.subproj/WebSubresourceClient.m:
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index bb767ac..dd877ec 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,3 +1,12 @@
+2002-10-10  Darin Adler  <darin at apple.com>
+
+	- fixed 3072015 -- REGRESSION: frames multiply endlessly
+
+        * WebCoreSupport.subproj/WebBridge.m: (-[WebBridge setFrame:]):
+	Remove code that sets the parent from here, because it's too early, always nil.
+        * WebView.subproj/WebFramePrivate.m: (-[WebFrame _addChild:]):
+	Do it here instead.
+
 2002-10-09  Richard Williamson   <rjw at apple.com>
 
         * WebCoreSupport.subproj/WebSubresourceClient.m:
diff --git a/WebKit/WebCoreSupport.subproj/WebBridge.m b/WebKit/WebCoreSupport.subproj/WebBridge.m
index 9cd16c9..91e642d 100644
--- a/WebKit/WebCoreSupport.subproj/WebBridge.m
+++ b/WebKit/WebCoreSupport.subproj/WebBridge.m
@@ -211,7 +211,6 @@
     if (frame == nil) {
 	// FIXME: non-retained because data source owns representation owns bridge
 	frame = webFrame;
-        [self setParent:[[frame parent] _bridge]];
         [self setTextSizeMultiplier:[[frame controller] textSizeMultiplier]];
     } else {
 	ASSERT(frame == webFrame);
diff --git a/WebKit/WebView.subproj/WebFramePrivate.m b/WebKit/WebView.subproj/WebFramePrivate.m
index da46c2b..6feedb1 100644
--- a/WebKit/WebView.subproj/WebFramePrivate.m
+++ b/WebKit/WebView.subproj/WebFramePrivate.m
@@ -791,6 +791,7 @@ static const char * const stateNames[] = {
     [_private->children addObject:child];
 
     child->_private->parent = self;
+    [[child _bridge] setParent:[self _bridge]];
     [[child dataSource] _setOverrideEncoding:[[self dataSource] _overrideEncoding]];   
 }
 

-- 
WebKit Debian packaging