[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 eb4c80d6fb9f592306a1143355fa3b46d5934c28
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Oct 15 19:52:13 2002 +0000

    	Fix problem where timer was lasting after window was closed.
    
            * WebView.subproj/WebFramePrivate.m: (-[WebFrame _detachFromParent]):
    	Add a call to [_private->bridge closeURL].
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@2330 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index c5c60d5..641c26f 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,10 @@
+2002-10-15  Darin Adler  <darin at apple.com>
+
+	Fix problem where timer was lasting after window was closed.
+
+        * WebView.subproj/WebFramePrivate.m: (-[WebFrame _detachFromParent]):
+	Add a call to [_private->bridge closeURL].
+
 2002-10-15  Richard Williamson  <rjw at apple.com>
 
         Added attributed string to pasteboard.  Fixes 3006760.
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index c5c60d5..641c26f 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,3 +1,10 @@
+2002-10-15  Darin Adler  <darin at apple.com>
+
+	Fix problem where timer was lasting after window was closed.
+
+        * WebView.subproj/WebFramePrivate.m: (-[WebFrame _detachFromParent]):
+	Add a call to [_private->bridge closeURL].
+
 2002-10-15  Richard Williamson  <rjw at apple.com>
 
         Added attributed string to pasteboard.  Fixes 3006760.
diff --git a/WebKit/WebView.subproj/WebFramePrivate.m b/WebKit/WebView.subproj/WebFramePrivate.m
index 6feedb1..0f9ef5b 100644
--- a/WebKit/WebView.subproj/WebFramePrivate.m
+++ b/WebKit/WebView.subproj/WebFramePrivate.m
@@ -128,6 +128,8 @@ static const char * const stateNames[] = {
 
 - (void)_detachFromParent
 {
+    [_private->bridge closeURL];
+
     [[self children] makeObjectsPerformSelector:@selector(_detachFromParent)];
     
     [_private setController:nil];
@@ -153,7 +155,7 @@ static const char * const stateNames[] = {
     ASSERT(ds != _private->dataSource);
     
     if ([_private->dataSource isDocumentHTML] && ![ds isDocumentHTML]) {
-        [[self _bridge] removeFromFrame];
+        [_private->bridge removeFromFrame];
     }
 
     [[self children] makeObjectsPerformSelector:@selector(_detachFromParent)];
@@ -452,7 +454,7 @@ static const char * const stateNames[] = {
 		// non-HTML content.
 
                 if ([ds isDocumentHTML]) {
-		    [[self _bridge] end];
+		    [_private->bridge end];
 		}
 
                 // Unfortunately we have to get our parent to adjust the frames in this
@@ -752,7 +754,7 @@ static const char * const stateNames[] = {
 
 - (void)_textSizeMultiplierChanged
 {
-    [[self _bridge] setTextSizeMultiplier:[[self controller] textSizeMultiplier]];
+    [_private->bridge setTextSizeMultiplier:[[self controller] textSizeMultiplier]];
     [[self children] makeObjectsPerformSelector:@selector(_textSizeMultiplierChanged)];
 }
 
@@ -791,7 +793,7 @@ static const char * const stateNames[] = {
     [_private->children addObject:child];
 
     child->_private->parent = self;
-    [[child _bridge] setParent:[self _bridge]];
+    [[child _bridge] setParent:_private->bridge];
     [[child dataSource] _setOverrideEncoding:[[self dataSource] _overrideEncoding]];   
 }
 

-- 
WebKit Debian packaging