[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 57b84bb384a9f3a8c649aad99c267465c0a264b2
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sun Jun 23 18:17:02 2002 +0000

            * WebCoreSupport.subproj/IFImageRenderer.m: (-[IFImageRenderer nextFrame:]):
            Use hasAlpha instead of isOpaque because the latter does not work (Radar 2966937).
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@1418 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index a279662..d678928 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,8 @@
+2002-06-23  Darin Adler  <darin at apple.com>
+
+        * WebCoreSupport.subproj/IFImageRenderer.m: (-[IFImageRenderer nextFrame:]):
+        Use hasAlpha instead of isOpaque because the latter does not work (Radar 2966937).
+
 2002-06-21  Darin Adler  <darin at apple.com>
 
         * WebCoreSupport.subproj/IFImageRenderer.m:
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index a279662..d678928 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,3 +1,8 @@
+2002-06-23  Darin Adler  <darin at apple.com>
+
+        * WebCoreSupport.subproj/IFImageRenderer.m: (-[IFImageRenderer nextFrame:]):
+        Use hasAlpha instead of isOpaque because the latter does not work (Radar 2966937).
+
 2002-06-21  Darin Adler  <darin at apple.com>
 
         * WebCoreSupport.subproj/IFImageRenderer.m:
diff --git a/WebKit/WebCoreSupport.subproj/IFImageRenderer.m b/WebKit/WebCoreSupport.subproj/IFImageRenderer.m
index 772501c..1913cf3 100644
--- a/WebKit/WebCoreSupport.subproj/IFImageRenderer.m
+++ b/WebKit/WebCoreSupport.subproj/IFImageRenderer.m
@@ -148,7 +148,9 @@ static NSMutableArray *activeImageRenderers;
     
     window = [frameView window];
     
-    if ([[[self representations] objectAtIndex:0] isOpaque]) {
+     // We can't use isOpaque because it returns YES for many non-opaque images (Radar 2966937).
+     // But we can at least assume that any image representatin without alpha is opaque.
+     if (![[[self representations] objectAtIndex:0] hasAlpha]) {
         if ([frameView canDraw]) {
             [frameView lockFocus];
             [self drawInRect:targetRect
diff --git a/WebKit/WebCoreSupport.subproj/WebImageRenderer.m b/WebKit/WebCoreSupport.subproj/WebImageRenderer.m
index 772501c..1913cf3 100644
--- a/WebKit/WebCoreSupport.subproj/WebImageRenderer.m
+++ b/WebKit/WebCoreSupport.subproj/WebImageRenderer.m
@@ -148,7 +148,9 @@ static NSMutableArray *activeImageRenderers;
     
     window = [frameView window];
     
-    if ([[[self representations] objectAtIndex:0] isOpaque]) {
+     // We can't use isOpaque because it returns YES for many non-opaque images (Radar 2966937).
+     // But we can at least assume that any image representatin without alpha is opaque.
+     if (![[[self representations] objectAtIndex:0] hasAlpha]) {
         if ([frameView canDraw]) {
             [frameView lockFocus];
             [self drawInRect:targetRect

-- 
WebKit Debian packaging