[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 f0e6136f4be728d9f29f40b21b49ecd0e8ae4d79
Author: rjw <rjw at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Apr 11 02:49:32 2003 +0000

            Fixed 3219525
    
            Our work-around for the CG pattern cache bogosity was always bypassed,
            consequently we'd unnecessarily burn lots of memory filling that cache.
    
            Reviewed by mjs & gramps.
    
            * WebCoreSupport.subproj/WebImageRenderer.m:
            (-[WebImageRenderer drawClippedToValidInRect:fromRect:]):
            (-[WebImageRenderer tileInRect:fromPoint:]):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@4072 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 7cb16fa..ebd5bb8 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,16 @@
+2003-04-10  Richard Williamson   <rjw at apple.com>
+
+        Fixed 3219525
+        
+        Our work-around for the CG pattern cache bogosity was always bypassed,
+        consequently we'd unnecessarily burn lots of memory filling that cache.
+        
+        Reviewed by mjs & gramps.
+
+        * WebCoreSupport.subproj/WebImageRenderer.m:
+        (-[WebImageRenderer drawClippedToValidInRect:fromRect:]):
+        (-[WebImageRenderer tileInRect:fromPoint:]):
+
 2003-04-10  Darin Adler (Maciej committing for Darin)  <darin at apple.com>
 
         Reviewed by Maciej.
diff --git a/WebKit/WebCoreSupport.subproj/WebImageRenderer.m b/WebKit/WebCoreSupport.subproj/WebImageRenderer.m
index b60b5d0..9939011 100644
--- a/WebKit/WebCoreSupport.subproj/WebImageRenderer.m
+++ b/WebKit/WebCoreSupport.subproj/WebImageRenderer.m
@@ -268,8 +268,6 @@ static NSMutableArray *activeImageRenderers;
         }
     }
     
-    fr.origin.y = [self size].height - fr.size.height;
-
     // This is the operation that handles transparent portions of the source image correctly.
     [self drawInRect:ir fromRect:fr operation:NSCompositeSourceOver fraction:1.0];
 }
@@ -373,8 +371,9 @@ static NSMutableArray *activeImageRenderers;
     CGSize phase = CGSizeMake(fmodf(originInWindow.x, size.width), fmodf(originInWindow.y, size.height));
     
     // If the single image draw covers the whole area, then just draw once.
-    if (NSContainsRect(oneTileRect, rect) && phase.width == 0 && phase.height == 0) {
+    if (NSContainsRect(oneTileRect, rect)) {
         NSRect fromRect;
+
         fromRect.origin.x = rect.origin.x - oneTileRect.origin.x;
         fromRect.origin.y = (oneTileRect.origin.y + oneTileRect.size.height) - (rect.origin.y + rect.size.height);
         fromRect.size = rect.size;
@@ -382,7 +381,7 @@ static NSMutableArray *activeImageRenderers;
         [self drawClippedToValidInRect:rect fromRect:fromRect];
         return;
     }
-    
+
     // If we only have a partial image, just do nothing, because CoreGraphics will not help us tile
     // with a partial image. But maybe later we can fix this by constructing a pattern image that's
     // transparent where needed.

-- 
WebKit Debian packaging