[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677

darin darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Sat Sep 26 06:22:15 UTC 2009


The following commit has been merged in the debian/unstable branch:
commit 261ef7a96d1dbcb2000e5119e64339b6099e09f5
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sun Jun 30 05:31:22 2002 +0000

            * WebCoreSupport.subproj/IFImageRenderer.m:
            (-[IFImageRenderer tileInRect:fromPoint:]): Fix calculation of oneTileRect.
    	I think this is finally correct now.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@1477 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 2159c3b..a281e2f 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,9 @@
+2002-06-29  Darin Adler  <darin at apple.com>
+
+        * WebCoreSupport.subproj/IFImageRenderer.m:
+        (-[IFImageRenderer tileInRect:fromPoint:]): Fix calculation of oneTileRect.
+	I think this is finally correct now.
+
 2002-06-29  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 2159c3b..a281e2f 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,3 +1,9 @@
+2002-06-29  Darin Adler  <darin at apple.com>
+
+        * WebCoreSupport.subproj/IFImageRenderer.m:
+        (-[IFImageRenderer tileInRect:fromPoint:]): Fix calculation of oneTileRect.
+	I think this is finally correct now.
+
 2002-06-29  Maciej Stachowiak  <mjs at apple.com>
 
         WebKit part of fix for:
diff --git a/WebKit/WebCoreSupport.subproj/IFImageRenderer.m b/WebKit/WebCoreSupport.subproj/IFImageRenderer.m
index d5e867b..ef2cb22 100644
--- a/WebKit/WebCoreSupport.subproj/IFImageRenderer.m
+++ b/WebKit/WebCoreSupport.subproj/IFImageRenderer.m
@@ -228,12 +228,8 @@ static NSMutableArray *activeImageRenderers;
     // Check and see if a single draw of the image can convert the entire area we are supposed to tile.
     WEBKIT_ASSERT([[NSView focusView] isFlipped]);
     NSRect oneTileRect;
-    oneTileRect.origin.x = fmodf(rect.origin.x - point.x, size.width);
-    if (oneTileRect.origin.x > 0)
-        oneTileRect.origin.x -= size.width;
-    oneTileRect.origin.y = fmodf(rect.origin.y - point.y, size.height);
-    if (oneTileRect.origin.y > 0)
-        oneTileRect.origin.y -= size.height;
+    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;
     
     // If the single image draw covers the whole area, then just draw once.
diff --git a/WebKit/WebCoreSupport.subproj/WebImageRenderer.m b/WebKit/WebCoreSupport.subproj/WebImageRenderer.m
index d5e867b..ef2cb22 100644
--- a/WebKit/WebCoreSupport.subproj/WebImageRenderer.m
+++ b/WebKit/WebCoreSupport.subproj/WebImageRenderer.m
@@ -228,12 +228,8 @@ static NSMutableArray *activeImageRenderers;
     // Check and see if a single draw of the image can convert the entire area we are supposed to tile.
     WEBKIT_ASSERT([[NSView focusView] isFlipped]);
     NSRect oneTileRect;
-    oneTileRect.origin.x = fmodf(rect.origin.x - point.x, size.width);
-    if (oneTileRect.origin.x > 0)
-        oneTileRect.origin.x -= size.width;
-    oneTileRect.origin.y = fmodf(rect.origin.y - point.y, size.height);
-    if (oneTileRect.origin.y > 0)
-        oneTileRect.origin.y -= size.height;
+    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;
     
     // If the single image draw covers the whole area, then just draw once.

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list