[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 4ca95c99fd88a723023af73244a7536865219ec6
Author: rjw <rjw at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Jul 17 02:39:40 2002 +0000

            Really, stop animation if last frame has zero duration, like IE.
            Was checking adjustedFrameDuration, which is never zero.
    
            * WebCoreSupport.subproj/WebImageRenderer.m:
            (-[WebImageRenderer unadjustedFrameDuration]):
            (-[WebImageRenderer frameDuration]):
            (-[WebImageRenderer nextFrame:]):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@1578 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 16919d1..3943a32 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,13 @@
+2002-07-16  Richard Williamson (Local)  <rjw at apple.com>
+
+        Really, stop animation if last frame has zero duration, like IE.
+        Was checking adjustedFrameDuration, which is never zero.
+
+        * WebCoreSupport.subproj/WebImageRenderer.m:
+        (-[WebImageRenderer unadjustedFrameDuration]):
+        (-[WebImageRenderer frameDuration]):
+        (-[WebImageRenderer nextFrame:]):
+
 2002-07-16  Maciej Stachowiak  <mjs at apple.com>
 
 	WebKit part of fix for:
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index 16919d1..3943a32 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,3 +1,13 @@
+2002-07-16  Richard Williamson (Local)  <rjw at apple.com>
+
+        Really, stop animation if last frame has zero duration, like IE.
+        Was checking adjustedFrameDuration, which is never zero.
+
+        * WebCoreSupport.subproj/WebImageRenderer.m:
+        (-[WebImageRenderer unadjustedFrameDuration]):
+        (-[WebImageRenderer frameDuration]):
+        (-[WebImageRenderer nextFrame:]):
+
 2002-07-16  Maciej Stachowiak  <mjs at apple.com>
 
 	WebKit part of fix for:
diff --git a/WebKit/WebCoreSupport.subproj/WebImageRenderer.m b/WebKit/WebCoreSupport.subproj/WebImageRenderer.m
index 23d3a1e..251d516 100644
--- a/WebKit/WebCoreSupport.subproj/WebImageRenderer.m
+++ b/WebKit/WebCoreSupport.subproj/WebImageRenderer.m
@@ -117,10 +117,16 @@ static NSMutableArray *activeImageRenderers;
 
 #define MINIMUM_DURATON  (1.0/30.0)
 
-- (float)frameDuration
+- (float)unadjustedFrameDuration
 {
     id property = [self firstRepProperty:NSImageCurrentFrameDuration];
     float duration = (property != nil ? [property floatValue] : 0.0);
+    return duration;
+}
+
+- (float)frameDuration
+{
+    float duration = [self unadjustedFrameDuration];
     if (duration < MINIMUM_DURATON){
         /*
             Many annoying ads specify a 0 duration to make an image flash
@@ -164,7 +170,7 @@ static NSMutableArray *activeImageRenderers;
     
     currentFrame = [self currentFrame] + 1;
     if (currentFrame >= [self frameCount]) {
-        if ([self frameDuration] == 0) {
+        if ([self unadjustedFrameDuration] == 0) {
             animationFinished = YES;	// Don't repeat if the last frame has a duration of 0.  
                                 // IE doesn't repeat, so we don't.
             return;

-- 
WebKit Debian packaging