[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 b028751dcfcb0b0ae0aedfcd3c5392e8bb645ad9
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Jun 15 08:30:25 2004 +0000

            - fixed crash introduced by my earlier change
    
            * WebCoreSupport.subproj/WebImageRenderer.m:
            (-[WebImageContext dealloc]): Set _cgsContext to 0 before calling super as before.
            (-[WebImageContext finalize]): Ditto.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@6852 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 43fdf09..62dcf2b 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,11 @@
+2004-06-15  Darin Adler  <darin at apple.com>
+
+        - fixed crash introduced by my earlier change
+
+        * WebCoreSupport.subproj/WebImageRenderer.m:
+        (-[WebImageContext dealloc]): Set _cgsContext to 0 before calling super as before.
+        (-[WebImageContext finalize]): Ditto.
+
 2004-06-14  Darin Adler  <darin at apple.com>
 
         Reviewed by Maciej.
diff --git a/WebKit/WebCoreSupport.subproj/WebImageRenderer.m b/WebKit/WebCoreSupport.subproj/WebImageRenderer.m
index 2023283..fb578e6 100644
--- a/WebKit/WebCoreSupport.subproj/WebImageRenderer.m
+++ b/WebKit/WebCoreSupport.subproj/WebImageRenderer.m
@@ -66,8 +66,9 @@ extern NSString *NSImageLoopCount;
     if (self != nil) {
 	_bounds     = b;
 	_isFlipped  = YES;
-        if (context)
+        if (context) {
             _cgsContext = CGContextRetain(context);
+        }
     }
     
     return self;
@@ -78,6 +79,7 @@ extern NSString *NSImageLoopCount;
     [_focusStack release];
     if (_cgsContext) {
         CGContextRelease(_cgsContext);
+        _cgsContext = 0; // super dealloc may also release
     }
     [super dealloc];
 }
@@ -86,6 +88,7 @@ extern NSString *NSImageLoopCount;
 {
     if (_cgsContext) {
         CGContextRelease(_cgsContext);
+        _cgsContext = 0; // super finalize may also release
     }
     [super finalize];
 }
@@ -381,7 +384,7 @@ static NSMutableSet *activeImageRenderers;
     [originalData release];
     
     if (context) {
-        CFRelease(context);
+        CGContextRelease(context);
     }
 
     [_PDFDoc release];
@@ -395,7 +398,7 @@ static NSMutableSet *activeImageRenderers;
     ASSERT(frameView == nil);
 
     if (context) {
-        CFRelease(context);
+        CGContextRelease(context);
     }
 
     [super finalize];
@@ -676,9 +679,9 @@ static NSMutableSet *activeImageRenderers;
     
     if (aContext != context) {
         if (aContext)
-            CFRetain(aContext);
+            CGContextRetain(aContext);
         if (context)
-            CFRelease(context);
+            CGContextRelease(context);
         context = aContext;
     }
         

-- 
WebKit Debian packaging