[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 dc067ad7d67deb19582425477600ef40ae2e458b
Author: rjw <rjw at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Mar 14 02:07:16 2002 +0000

     Added support to stop plugins in removeFromSuperview.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@736 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 257d976..528dde4 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,5 +1,13 @@
 2002-03-13  Richard Williamson  <rjw at apple.com>
 
+        Added support to stop plugins in removeFromSuperview.
+        
+	* WebView.subproj/IFWebFramePrivate.mm: (-[IFWebFrame _checkLoadComplete:]):
+	* WebView.subproj/IFWebView.mm: (-[IFWebView dealloc]), (-[IFWebView
+	removeFromSuperview]), (-[IFWebView removeFromSuperviewWithoutNeedingDisplay]):
+
+2002-03-13  Richard Williamson  <rjw at apple.com>
+
         Fixed open window w/ no open windows crasher.
         
 	* ChangeLog:
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index 257d976..528dde4 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,5 +1,13 @@
 2002-03-13  Richard Williamson  <rjw at apple.com>
 
+        Added support to stop plugins in removeFromSuperview.
+        
+	* WebView.subproj/IFWebFramePrivate.mm: (-[IFWebFrame _checkLoadComplete:]):
+	* WebView.subproj/IFWebView.mm: (-[IFWebView dealloc]), (-[IFWebView
+	removeFromSuperview]), (-[IFWebView removeFromSuperviewWithoutNeedingDisplay]):
+
+2002-03-13  Richard Williamson  <rjw at apple.com>
+
         Fixed open window w/ no open windows crasher.
         
 	* ChangeLog:
diff --git a/WebKit/WebView.subproj/IFWebFramePrivate.mm b/WebKit/WebView.subproj/IFWebFramePrivate.mm
index 56866d8..1c62048 100644
--- a/WebKit/WebView.subproj/IFWebFramePrivate.mm
+++ b/WebKit/WebView.subproj/IFWebFramePrivate.mm
@@ -163,9 +163,10 @@
     }
 
     if (![[self dataSource] isLoading]){
-        if (error)
+        if (error) {
             [self _setLastError: error];
-
+        }
+        
         [self _setState: IFWEBFRAMESTATE_COMPLETE];
         
         [[self dataSource] _part]->end();
diff --git a/WebKit/WebView.subproj/IFWebView.mm b/WebKit/WebView.subproj/IFWebView.mm
index 5015098..fe52cc0 100644
--- a/WebKit/WebView.subproj/IFWebView.mm
+++ b/WebKit/WebView.subproj/IFWebView.mm
@@ -37,6 +37,7 @@
 
 - (void)dealloc 
 {
+    [self _stopPlugins];
     [[NSNotificationCenter defaultCenter] removeObserver: self];
     [_viewPrivate release];
     [super dealloc];
@@ -51,6 +52,19 @@
 }
 
 
+- (void)removeFromSuperview
+{
+    [self _stopPlugins];
+    [super removeFromSuperview];
+}
+
+
+- (void)removeFromSuperviewWithoutNeedingDisplay
+{
+    [self _stopPlugins];
+    [super removeFromSuperviewWithoutNeedingDisplay];
+}
+
 
 // This method is typically called by the view's controller when
 // the data source is changed.
diff --git a/WebKit/WebView.subproj/WebFramePrivate.m b/WebKit/WebView.subproj/WebFramePrivate.m
index 56866d8..1c62048 100644
--- a/WebKit/WebView.subproj/WebFramePrivate.m
+++ b/WebKit/WebView.subproj/WebFramePrivate.m
@@ -163,9 +163,10 @@
     }
 
     if (![[self dataSource] isLoading]){
-        if (error)
+        if (error) {
             [self _setLastError: error];
-
+        }
+        
         [self _setState: IFWEBFRAMESTATE_COMPLETE];
         
         [[self dataSource] _part]->end();
diff --git a/WebKit/WebView.subproj/WebFrameView.m b/WebKit/WebView.subproj/WebFrameView.m
index 5015098..fe52cc0 100644
--- a/WebKit/WebView.subproj/WebFrameView.m
+++ b/WebKit/WebView.subproj/WebFrameView.m
@@ -37,6 +37,7 @@
 
 - (void)dealloc 
 {
+    [self _stopPlugins];
     [[NSNotificationCenter defaultCenter] removeObserver: self];
     [_viewPrivate release];
     [super dealloc];
@@ -51,6 +52,19 @@
 }
 
 
+- (void)removeFromSuperview
+{
+    [self _stopPlugins];
+    [super removeFromSuperview];
+}
+
+
+- (void)removeFromSuperviewWithoutNeedingDisplay
+{
+    [self _stopPlugins];
+    [super removeFromSuperviewWithoutNeedingDisplay];
+}
+
 
 // This method is typically called by the view's controller when
 // the data source is changed.

-- 
WebKit Debian packaging