[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 a48249a44a9ab2517179ae86cf2b76c30e8c3ffa
Author: rjw <rjw at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Jan 10 02:06:35 2003 +0000

            Fixed 3143361.  This was a regression introduced with some image
            rendering optimizations.  Don't bypass the tiling code path if
            the image needs to be rendered out-of-phase.
    
            Reviewed by hyatt.
    
            * WebCoreSupport.subproj/WebImageRenderer.m:
            (-[WebImageRenderer tileInRect:fromPoint:]):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@3290 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 75fe367..c6a7e80 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,14 @@
+2003-01-09  Richard Williamson   <rjw at apple.com>
+
+        Fixed 3143361.  This was a regression introduced with some image
+        rendering optimizations.  Don't bypass the tiling code path if
+        the image needs to be rendered out-of-phase.
+        
+        Reviewed by hyatt.
+
+        * WebCoreSupport.subproj/WebImageRenderer.m:
+        (-[WebImageRenderer tileInRect:fromPoint:]):
+
 2003-01-09  Darin Adler  <darin at apple.com>
 
         Reviewed by Chris.
diff --git a/WebKit/WebCoreSupport.subproj/WebImageRenderer.m b/WebKit/WebCoreSupport.subproj/WebImageRenderer.m
index d7fff88..dc80dfc 100644
--- a/WebKit/WebCoreSupport.subproj/WebImageRenderer.m
+++ b/WebKit/WebCoreSupport.subproj/WebImageRenderer.m
@@ -360,9 +360,14 @@ static NSMutableArray *activeImageRenderers;
     oneTileRect.origin.x = rect.origin.x + fmodf(fmodf(-point.x, size.width) - size.width, size.width);
     oneTileRect.origin.y = rect.origin.y + fmodf(fmodf(-point.y, size.height) - size.height, size.height);
     oneTileRect.size = size;
+
+    // Compute the appropriate phase relative to the top level view in the window.
+    // Conveniently, the oneTileRect we computed above has the appropriate origin.
+    NSPoint originInWindow = [[NSView focusView] convertPoint:oneTileRect.origin toView:nil];
+    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)) {
+    if (NSContainsRect(oneTileRect, rect) && phase.width == 0 && phase.height == 0) {
         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);
@@ -388,12 +393,7 @@ static NSMutableArray *activeImageRenderers;
         patternColor = [[NSColor colorWithPatternImage:self] retain];
         patternColorLoadStatus = loadStatus;
     }
-    
-    // Compute the appropriate phase relative to the top level view in the window.
-    // Conveniently, the oneTileRect we computed above has the appropriate origin.
-    NSPoint originInWindow = [[NSView focusView] convertPoint:oneTileRect.origin toView:nil];
-    CGSize phase = CGSizeMake(fmodf(originInWindow.x, size.width), fmodf(originInWindow.y, size.height));
-    
+        
     [NSGraphicsContext saveGraphicsState];
     
     CGContextSetPatternPhase((CGContextRef)[[NSGraphicsContext currentContext] graphicsPort], phase);    

-- 
WebKit Debian packaging