[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 c67582ff47c353d8367e9e0387d326cf7e8746df
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Nov 4 07:05:51 2002 +0000

    WebFoundation:
    
            * AuthenticationManager.subproj/WebKeychainCredential.m:
            (-[WebKeychainCredentialPrivate dealloc]): Check for NULL before calling
    	CFRelease, since our dealloc function can be called even before our init
    	function runs if a base class decides to do the "[self release]; return nil;"
    	thing in its init function.
    
            * CookieManager.subproj/WebCookieStorageServer.m:
            (-[WebCookieStorageServerPrivate dealloc]): Remove call to invalidate, since,
    	as Trey reminded us, it's pointless to invalidate a timer that retains us in
    	our dealloc function.
    
    WebKit:
    
            * Plugins.subproj/WebPlugin.h: Fix comment.
    
            * Plugins.subproj/WebPluginError.m: (-[WebPluginErrorPrivate dealloc]):
    	Fix leak by calling [super dealloc].
    
            * WebView.subproj/WebFramePrivate.m: (-[WebFramePrivate dealloc]): Remove the
    	timer invalidate since, as Trey pointed out, it's pointless to invalidate a
    	timer in dealloc if it's retaining this object while valid.
    
    WebBrowser:
    
            * DiskCopyPuppetStrings.h: Remove bogus Log section.
    	Fix header guard that was broken.
    
            * DownloadRow.m: (-[DownloadRow dealloc]): Fix leak by calling [super dealloc].
            * DownloadViewController.m: (-[DownloadViewController dealloc]): Ditto.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@2546 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 9197024..5ad6506 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,14 @@
+2002-11-03  Darin Adler  <darin at apple.com>
+
+        * Plugins.subproj/WebPlugin.h: Fix comment.
+
+        * Plugins.subproj/WebPluginError.m: (-[WebPluginErrorPrivate dealloc]):
+	Fix leak by calling [super dealloc].
+
+        * WebView.subproj/WebFramePrivate.m: (-[WebFramePrivate dealloc]): Remove the
+	timer invalidate since, as Trey pointed out, it's pointless to invalidate a
+	timer in dealloc if it's retaining this object while valid.
+
 2002-11-03  Chris Blumenberg  <cblu at apple.com>
 
 	- Added MacBinary decoding code. Not yet used.
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index 9197024..5ad6506 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,3 +1,14 @@
+2002-11-03  Darin Adler  <darin at apple.com>
+
+        * Plugins.subproj/WebPlugin.h: Fix comment.
+
+        * Plugins.subproj/WebPluginError.m: (-[WebPluginErrorPrivate dealloc]):
+	Fix leak by calling [super dealloc].
+
+        * WebView.subproj/WebFramePrivate.m: (-[WebFramePrivate dealloc]): Remove the
+	timer invalidate since, as Trey pointed out, it's pointless to invalidate a
+	timer in dealloc if it's retaining this object while valid.
+
 2002-11-03  Chris Blumenberg  <cblu at apple.com>
 
 	- Added MacBinary decoding code. Not yet used.
diff --git a/WebKit/Plugins.subproj/WebPlugInError.m b/WebKit/Plugins.subproj/WebPlugInError.m
index 84a0157..cf864e4 100644
--- a/WebKit/Plugins.subproj/WebPlugInError.m
+++ b/WebKit/Plugins.subproj/WebPlugInError.m
@@ -27,6 +27,7 @@
     [MIMEType release];
     [pluginPageURL release];
     [pluginName release];
+    [super dealloc];
 }
 
 @end
diff --git a/WebKit/Plugins.subproj/WebPlugin.h b/WebKit/Plugins.subproj/WebPlugin.h
index 35004c1..03734e8 100644
--- a/WebKit/Plugins.subproj/WebPlugin.h
+++ b/WebKit/Plugins.subproj/WebPlugin.h
@@ -45,7 +45,7 @@
 
 /*!
     @method pluginDestroy
-    @abstract Tell the plugin perform cleanup and prepare to be dealloced.
+    @abstract Tell the plugin perform cleanup and prepare to be deallocated.
     @discussion The plug-in typically releases memory and other resources in this
     method.  If the plug-in has retained the WebPluginContainer, it must release
     it in this mehthod.  This method must be only called once per instance of the
diff --git a/WebKit/WebView.subproj/WebFramePrivate.m b/WebKit/WebView.subproj/WebFramePrivate.m
index 151c752..cd6c417 100644
--- a/WebKit/WebView.subproj/WebFramePrivate.m
+++ b/WebKit/WebView.subproj/WebFramePrivate.m
@@ -57,18 +57,16 @@ static const char * const stateNames[] = {
 
 - (void)dealloc
 {
-    [scheduledLayoutTimer invalidate];
-    [scheduledLayoutTimer release];
-    
     [webView _setController:nil];
     [dataSource _setController:nil];
     [provisionalDataSource _setController:nil];
 
-    [bridge release];
     [name release];
     [webView release];
     [dataSource release];
     [provisionalDataSource release];
+    [bridge release];
+    [scheduledLayoutTimer release];
     [children release];
     [pluginController release];
     

-- 
WebKit Debian packaging