[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 2da1a24c577789941dda825b634cb004d5640894
Author: rjw <rjw at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Sep 11 00:12:25 2003 +0000

    	Fixed 3231031.  Use the normal methodology for displaying each frame of a GIF.  That is,
    	just call setNeedsDisplayInRect, rather than drawing directly.  Drawing directly violates
    	layering/clipping.
    
            Reviewed by Dave Hyatt.
    
            * WebCoreSupport.subproj/WebImageRenderer.m:
            (-[WebImageRenderer nextFrame:]):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@4965 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 8de82c3..41b2a78 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,14 @@
+2003-09-10  Richard Williamson   <rjw at apple.com>
+
+	Fixed 3231031.  Use the normal methodology for displaying each frame of a GIF.  That is,
+	just call setNeedsDisplayInRect, rather than drawing directly.  Drawing directly violates
+	layering/clipping.
+
+        Reviewed by Dave Hyatt.
+
+        * WebCoreSupport.subproj/WebImageRenderer.m:
+        (-[WebImageRenderer nextFrame:]):
+
 === Safari-100 ===
 
 2003-09-09  Richard Williamson   <rjw at apple.com>
diff --git a/WebKit/WebCoreSupport.subproj/WebImageRenderer.m b/WebKit/WebCoreSupport.subproj/WebImageRenderer.m
index d35cc5b..177c7d4 100644
--- a/WebKit/WebCoreSupport.subproj/WebImageRenderer.m
+++ b/WebKit/WebCoreSupport.subproj/WebImageRenderer.m
@@ -321,7 +321,6 @@ static NSMutableSet *activeImageRenderers;
 - (void)nextFrame:(id)context
 {
     int currentFrame;
-    NSWindow *window;
     
     // Release the timer that just fired.
     [frameTimer release];
@@ -337,28 +336,7 @@ static NSMutableSet *activeImageRenderers;
         currentFrame = 0;
     }
     [self setCurrentFrame:currentFrame];
-    
-    window = [frameView window];
-    
-     // 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 representation without alpha is opaque.
-     if (![[[self representations] objectAtIndex:0] hasAlpha]) {
-        if ([frameView canDraw]) {
-            [frameView lockFocus];
-            [self drawClippedToValidInRect:targetRect fromRect:imageRect];
-            [frameView unlockFocus];
-        }
-        if (!animationFinished) {
-            [self scheduleFrame];
-        }
-    } else {
-        // No need to schedule the next frame in this case.  The display
-        // will eventually cause the image to be redrawn and the next frame
-        // will be scheduled in beginAnimationInRect:fromRect:.
-        [frameView displayRect:targetRect];
-    }
-    
-    [window flushWindow];
+    [frameView setNeedsDisplayInRect:targetRect];
 }
 
 - (void)beginAnimationInRect:(NSRect)ir fromRect:(NSRect)fr

-- 
WebKit Debian packaging