[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 87afd13a2372d6c8b09c149eb43575b01790ba92
Author: rjw <rjw at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Sep 11 22:43:54 2002 +0000

    i        Better fix for previous problem.
    
            * WebCoreSupport.subproj/WebTextRenderer.m:
            (-[WebTextRenderer floatWidthForCharacters:stringLength:fromCharacterPosition:numberOfCharacters:applyRounding:attemptFontSubstitution:]):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@2039 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index f804942..b205bcc 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,10 @@
+2002-09-11  Richard Williamson  <rjw at apple.com>
+
+        Better fix for previous problem.
+        
+        * WebCoreSupport.subproj/WebTextRenderer.m:
+        (-[WebTextRenderer floatWidthForCharacters:stringLength:fromCharacterPosition:numberOfCharacters:applyRounding:attemptFontSubstitution:]):
+
 2002-09-11  Richard Williamson (Local)  <rjw at apple.com>
 
         Remove ceiling of text width at end of fragment.  This was screwing up
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index f804942..b205bcc 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,3 +1,10 @@
+2002-09-11  Richard Williamson  <rjw at apple.com>
+
+        Better fix for previous problem.
+        
+        * WebCoreSupport.subproj/WebTextRenderer.m:
+        (-[WebTextRenderer floatWidthForCharacters:stringLength:fromCharacterPosition:numberOfCharacters:applyRounding:attemptFontSubstitution:]):
+
 2002-09-11  Richard Williamson (Local)  <rjw at apple.com>
 
         Remove ceiling of text width at end of fragment.  This was screwing up
diff --git a/WebKit/WebCoreSupport.subproj/WebTextRenderer.m b/WebKit/WebCoreSupport.subproj/WebTextRenderer.m
index 0220b5b..3bab301 100644
--- a/WebKit/WebCoreSupport.subproj/WebTextRenderer.m
+++ b/WebKit/WebCoreSupport.subproj/WebTextRenderer.m
@@ -871,6 +871,11 @@ cleanup:
         totalWidth += lastWidth;       
     }
 
+    // Don't ever apply rounding for single character.  Single character measurement
+    // intra word needs to be non-ceiled.
+    if ((len > 1 || stringLength == 1) && applyRounding)
+        totalWidth += ceil(totalWidth) - totalWidth;
+
     return totalWidth;
 }
 

-- 
WebKit Debian packaging