[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 287c727a5a617d1097e63453c4714f7f1c7c1c54
Author: rjw <rjw at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Jan 6 23:09:01 2004 +0000

    	Fixed 3513660.  Make ATSU layout and draw with integer glyph boundaries.  This fix should be removed if/when we convert WebCore to use floats for measuring/positioning (3521781).
    
            Reviewed by John.
    
            * WebCoreSupport.subproj/WebTextRenderer.m:
            (-[WebTextRenderer _createATSUTextLayoutForRun:]):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@5861 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 8048ab9..ec5c146 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,12 @@
+2004-01-06  Richard Williamson   <rjw at apple.com>
+
+	Fixed 3513660.  Make ATSU layout and draw with integer glyph boundaries.  This fix should be removed if/when we convert WebCore to use floats for measuring/positioning (3521781).
+
+        Reviewed by John.
+
+        * WebCoreSupport.subproj/WebTextRenderer.m:
+        (-[WebTextRenderer _createATSUTextLayoutForRun:]):
+
 2004-01-05  Richard Williamson   <rjw at apple.com>
 
 	Fix for 3514454.  Work-around added for 3521759.
diff --git a/WebKit/WebCoreSupport.subproj/WebTextRenderer.m b/WebKit/WebCoreSupport.subproj/WebTextRenderer.m
index 810fb6c..b7453f9 100644
--- a/WebKit/WebCoreSupport.subproj/WebTextRenderer.m
+++ b/WebKit/WebCoreSupport.subproj/WebTextRenderer.m
@@ -1365,11 +1365,12 @@ static const char *joiningNames[] = {
         FATAL_ALWAYS ("ATSUCreateTextLayoutWithTextPtr failed(%d)", status);
 
     CGContextRef cgContext = (CGContextRef)[[NSGraphicsContext currentContext] graphicsPort];
-    ATSUAttributeTag tags[] = { kATSUCGContextTag};
-    ByteCount sizes[] = { sizeof(CGContextRef) };
-    ATSUAttributeValuePtr values[] = { &cgContext };
+    ATSLineLayoutOptions lineLayoutOptions = (kATSLineFractDisable | kATSLineDisableAutoAdjustDisplayPos | kATSLineUseDeviceMetrics);
+    ATSUAttributeTag tags[] = { kATSUCGContextTag, kATSULineLayoutOptionsTag };
+    ByteCount sizes[] = { sizeof(CGContextRef), sizeof(ATSLineLayoutOptions)  };
+    ATSUAttributeValuePtr values[] = { &cgContext, &lineLayoutOptions };
     
-    status = ATSUSetLayoutControls(layout, 1, tags, sizes, values);
+    status = ATSUSetLayoutControls(layout, 2, tags, sizes, values);
     if(status != noErr)
         FATAL_ALWAYS ("ATSUSetLayoutControls failed(%d)", status);
 

-- 
WebKit Debian packaging