[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 54148000281ed8c726465b0f70cef307bdad1bd7
Author: rjw <rjw at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Jun 25 00:28:04 2004 +0000

    		Fixed <rdar://problem/3710313>: CGContext not zeroed when WebImageRenderer is copied
    		The context ivar of WebImageRenderer wasn't being nil when the object was copied.
    
            Reviewed by Darin.
    
            * WebCoreSupport.subproj/WebImageRenderer.m:
            (-[WebImageRenderer copyWithZone:]):
            (-[WebImageRenderer dealloc]):
            (-[WebImageRenderer drawImageInRect:fromRect:compositeOperator:context:]):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@6934 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 524729a..6fa734a 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,15 @@
+2004-06-24  Richard Williamson   <rjw at apple.com>
+
+		Fixed <rdar://problem/3710313>: CGContext not zeroed when WebImageRenderer is copied
+		The context ivar of WebImageRenderer wasn't being nil when the object was copied.
+
+        Reviewed by Darin.
+
+        * WebCoreSupport.subproj/WebImageRenderer.m:
+        (-[WebImageRenderer copyWithZone:]):
+        (-[WebImageRenderer dealloc]):
+        (-[WebImageRenderer drawImageInRect:fromRect:compositeOperator:context:]):
+
 2004-06-24  Trey Matteson  <trey at apple.com>
 
 	3672725 - Assertion failure in URLCompletion code with particular set of bookmarks
diff --git a/WebKit/WebCoreSupport.subproj/WebImageRenderer.m b/WebKit/WebCoreSupport.subproj/WebImageRenderer.m
index 31aebe0..c2202b5 100644
--- a/WebKit/WebCoreSupport.subproj/WebImageRenderer.m
+++ b/WebKit/WebCoreSupport.subproj/WebImageRenderer.m
@@ -287,6 +287,7 @@ static NSMutableSet *activeImageRenderers;
     copy->frameView = nil;
     copy->patternColor = nil;
     copy->compositeOperator = compositeOperator;
+    copy->context = 0;
         
     return copy;
 }
@@ -386,6 +387,7 @@ static NSMutableSet *activeImageRenderers;
     
     if (context) {
         CGContextRelease(context);
+        context = 0;
     }
 
     [_PDFDoc release];
@@ -679,10 +681,12 @@ static NSMutableSet *activeImageRenderers;
     compositeOperator = operator;
     
     if (aContext != context) {
-        if (aContext)
+        if (aContext) {
             CGContextRetain(aContext);
-        if (context)
+        }
+        if (context) {
             CGContextRelease(context);
+        }
         context = aContext;
     }
         

-- 
WebKit Debian packaging