[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 808ae944ea02a964cab9e846efd0fe8cd243f9bf
Author: rjw <rjw at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu May 30 15:38:57 2002 +0000

        Added 'canDraw' check to ensure that we can render
        an image frame.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@1235 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 6c70e66..d3aabe9 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,10 @@
+2002-05-30  Richard Williamson  <rjw at apple.com>
+
+    Added 'canDraw' check to ensure that we can render
+    an image frame.
+    
+	* WebCoreSupport.subproj/IFImageRenderer.m:
+
 2002-05-29  Richard Williamson  <rjw at apple.com>
 
     Changes to support animated image rendering.
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index 6c70e66..d3aabe9 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,3 +1,10 @@
+2002-05-30  Richard Williamson  <rjw at apple.com>
+
+    Added 'canDraw' check to ensure that we can render
+    an image frame.
+    
+	* WebCoreSupport.subproj/IFImageRenderer.m:
+
 2002-05-29  Richard Williamson  <rjw at apple.com>
 
     Changes to support animated image rendering.
diff --git a/WebKit/WebCoreSupport.subproj/IFImageRenderer.m b/WebKit/WebCoreSupport.subproj/IFImageRenderer.m
index 02a9dfb..501230d 100644
--- a/WebKit/WebCoreSupport.subproj/IFImageRenderer.m
+++ b/WebKit/WebCoreSupport.subproj/IFImageRenderer.m
@@ -60,13 +60,15 @@
         
     [self setCurrentFrame: currentFrame];
     
-    [frameView lockFocus];
-    [self drawInRect: targetRect
-            fromRect: imageRect
-            operation: NSCompositeSourceOver	// Renders transparency correctly
-            fraction: 1.0];
-    [frameView unlockFocus];
-    [[frameView window] flushWindow];
+    if ([frameView canDraw]){
+        [frameView lockFocus];
+        [self drawInRect: targetRect
+                fromRect: imageRect
+                operation: NSCompositeSourceOver	// Renders transparency correctly
+                fraction: 1.0];
+        [frameView unlockFocus];
+        [[frameView window] flushWindow];
+    }
 
     float frameDuration = [self frameDuration];
     frameTimer = [[NSTimer scheduledTimerWithTimeInterval: frameDuration
diff --git a/WebKit/WebCoreSupport.subproj/WebImageRenderer.m b/WebKit/WebCoreSupport.subproj/WebImageRenderer.m
index 02a9dfb..501230d 100644
--- a/WebKit/WebCoreSupport.subproj/WebImageRenderer.m
+++ b/WebKit/WebCoreSupport.subproj/WebImageRenderer.m
@@ -60,13 +60,15 @@
         
     [self setCurrentFrame: currentFrame];
     
-    [frameView lockFocus];
-    [self drawInRect: targetRect
-            fromRect: imageRect
-            operation: NSCompositeSourceOver	// Renders transparency correctly
-            fraction: 1.0];
-    [frameView unlockFocus];
-    [[frameView window] flushWindow];
+    if ([frameView canDraw]){
+        [frameView lockFocus];
+        [self drawInRect: targetRect
+                fromRect: imageRect
+                operation: NSCompositeSourceOver	// Renders transparency correctly
+                fraction: 1.0];
+        [frameView unlockFocus];
+        [[frameView window] flushWindow];
+    }
 
     float frameDuration = [self frameDuration];
     frameTimer = [[NSTimer scheduledTimerWithTimeInterval: frameDuration

-- 
WebKit Debian packaging