[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 a4b1932eb37163ba4dc410f39f3124fd8e99c094
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sat Jun 1 19:40:08 2002 +0000

    	* WebCoreSupport.subproj/IFImageRenderer.m:
    	(-[IFImageRenderer beginAnimationInView:inRect:fromRect:]):
    	Remove an assert I added, since it is firing, and instead fixed the storage leak
    	that inspired me to put the assert in.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@1253 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 95abea5..4254a65 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,10 @@
+2002-06-01  Darin Adler  <darin at apple.com>
+
+	* WebCoreSupport.subproj/IFImageRenderer.m:
+	(-[IFImageRenderer beginAnimationInView:inRect:fromRect:]):
+	Remove an assert I added, since it is firing, and instead fixed the storage leak
+	that inspired me to put the assert in.
+
 2002-05-31  Darin Adler  <darin at apple.com>
 
 	* WebView.subproj/IFWebViewPrivate.mm: Add include to prepare for change to WebCore
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index 95abea5..4254a65 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,3 +1,10 @@
+2002-06-01  Darin Adler  <darin at apple.com>
+
+	* WebCoreSupport.subproj/IFImageRenderer.m:
+	(-[IFImageRenderer beginAnimationInView:inRect:fromRect:]):
+	Remove an assert I added, since it is firing, and instead fixed the storage leak
+	that inspired me to put the assert in.
+
 2002-05-31  Darin Adler  <darin at apple.com>
 
 	* WebView.subproj/IFWebViewPrivate.mm: Add include to prepare for change to WebCore
diff --git a/WebKit/WebCoreSupport.subproj/IFImageRenderer.m b/WebKit/WebCoreSupport.subproj/IFImageRenderer.m
index 26180db..62f4de6 100644
--- a/WebKit/WebCoreSupport.subproj/IFImageRenderer.m
+++ b/WebKit/WebCoreSupport.subproj/IFImageRenderer.m
@@ -80,14 +80,14 @@
 
 - (void)beginAnimationInView: (NSView *)view inRect: (NSRect)ir fromRect: (NSRect)fr
 {
-    WEBKIT_ASSERT(frameView == nil);
-    
     [self stopAnimation];
     
     if ([self frameCount] > 1) {
         imageRect = fr;
         targetRect = ir;
-        frameView = [view retain];
+        [view retain];
+        [frameView release];
+        frameView = view;
         frameTimer = [[NSTimer scheduledTimerWithTimeInterval:[self frameDuration]
                                                        target:self
                                                      selector:@selector(nextFrame:)
diff --git a/WebKit/WebCoreSupport.subproj/WebImageRenderer.m b/WebKit/WebCoreSupport.subproj/WebImageRenderer.m
index 26180db..62f4de6 100644
--- a/WebKit/WebCoreSupport.subproj/WebImageRenderer.m
+++ b/WebKit/WebCoreSupport.subproj/WebImageRenderer.m
@@ -80,14 +80,14 @@
 
 - (void)beginAnimationInView: (NSView *)view inRect: (NSRect)ir fromRect: (NSRect)fr
 {
-    WEBKIT_ASSERT(frameView == nil);
-    
     [self stopAnimation];
     
     if ([self frameCount] > 1) {
         imageRect = fr;
         targetRect = ir;
-        frameView = [view retain];
+        [view retain];
+        [frameView release];
+        frameView = view;
         frameTimer = [[NSTimer scheduledTimerWithTimeInterval:[self frameDuration]
                                                        target:self
                                                      selector:@selector(nextFrame:)

-- 
WebKit Debian packaging