[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677

[hyatt]

The following commit has been merged in the debian/unstable branch:
commit 1e2214674c9d06826d46547c33254759db0e6bb5
Author: hyatt <hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Jul 11 17:54:32 2003 +0000

    	Make sure image compositing obeys the current global alpha that
    	is in effect, e.g., if someone has set an opacity within the
    	current layer.
    
    	It's worth noting that I'm not even sure *why* this patch works,
    	but it does, even with nested opacity layers.
    
            Reviewed by darin
    
            * WebCoreSupport.subproj/WebImageRenderer.m:
            (-[WebImageRenderer drawClippedToValidInRect:fromRect:]):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@4625 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 05d90a1..3c94455 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,17 @@
+2003-07-11  Dave Hyatt  <hyatt at apple.com>
+
+	Make sure image compositing obeys the current global alpha that
+	is in effect, e.g., if someone has set an opacity within the
+	current layer.
+
+	It's worth noting that I'm not even sure *why* this patch works,
+	but it does, even with nested opacity layers.
+	
+        Reviewed by darin
+
+        * WebCoreSupport.subproj/WebImageRenderer.m:
+        (-[WebImageRenderer drawClippedToValidInRect:fromRect:]):
+
 === Safari-89 ===
 
 2003-07-10  Richard Williamson   <rjw at apple.com>
diff --git a/WebKit/WebCoreSupport.subproj/WebImageRenderer.m b/WebKit/WebCoreSupport.subproj/WebImageRenderer.m
index cc34262..79e94a6 100644
--- a/WebKit/WebCoreSupport.subproj/WebImageRenderer.m
+++ b/WebKit/WebCoreSupport.subproj/WebImageRenderer.m
@@ -10,6 +10,8 @@
 #import <WebCore/WebCoreImageRenderer.h>
 #import <WebKit/WebAssertions.h>
 
+#import <CoreGraphics/CGContextGState.h>
+
 extern NSString *NSImageLoopCount;
 
 #define MINIMUM_DURATION (1.0/30.0)
@@ -277,7 +279,8 @@ static NSMutableSet *activeImageRenderers;
     }
     
     // This is the operation that handles transparent portions of the source image correctly.
-    [self drawInRect:ir fromRect:fr operation:NSCompositeSourceOver fraction:1.0];
+    CGContextRef context = (CGContextRef)([[NSGraphicsContext currentContext] graphicsPort]);
+    [self drawInRect:ir fromRect:fr operation:NSCompositeSourceOver fraction:CGContextGetAlpha(context)];
 }
 
 - (void)nextFrame:(id)context

-- 
WebKit Debian packaging