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

[hyatt]

The following commit has been merged in the debian/unstable branch:
commit 5d3860e7429efecb2730bff1428834cf258e9ce5
Author: hyatt <hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Jul 22 18:24:02 2003 +0000

    	Fix for 3293898, list bullets in ordered lists with an inside list
    	position were rendering as though they had a width of 0.  This was
    	a bug in KWQFontMetrics, which needed to handle the case where a
    	length of -1 was passed in to the width method (in which case
    	you should use the length of the whole string).
    
            Reviewed by john
    
            * kwq/KWQFontMetrics.mm:
            (QFontMetrics::width):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@4685 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 7f4747f..d0f3c64 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,5 +1,18 @@
 2003-07-22  Dave Hyatt  <hyatt at apple.com>
 
+	Fix for 3293898, list bullets in ordered lists with an inside list
+	position were rendering as though they had a width of 0.  This was
+	a bug in KWQFontMetrics, which needed to handle the case where a
+	length of -1 was passed in to the width method (in which case
+	you should use the length of the whole string).
+	
+        Reviewed by john
+
+        * kwq/KWQFontMetrics.mm:
+        (QFontMetrics::width):
+
+2003-07-22  Dave Hyatt  <hyatt at apple.com>
+
 	Fix for mozilla.org front page.  This patch re-architects 
 	align="left" and align="right" (for rtl and ltr directionality
 	respectively).  The attributes are mapped to custom text-align
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 7f4747f..d0f3c64 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,5 +1,18 @@
 2003-07-22  Dave Hyatt  <hyatt at apple.com>
 
+	Fix for 3293898, list bullets in ordered lists with an inside list
+	position were rendering as though they had a width of 0.  This was
+	a bug in KWQFontMetrics, which needed to handle the case where a
+	length of -1 was passed in to the width method (in which case
+	you should use the length of the whole string).
+	
+        Reviewed by john
+
+        * kwq/KWQFontMetrics.mm:
+        (QFontMetrics::width):
+
+2003-07-22  Dave Hyatt  <hyatt at apple.com>
+
 	Fix for mozilla.org front page.  This patch re-architects 
 	align="left" and align="right" (for rtl and ltr directionality
 	respectively).  The attributes are mapped to custom text-align
diff --git a/WebCore/kwq/KWQFontMetrics.mm b/WebCore/kwq/KWQFontMetrics.mm
index 247f9cc..b40347b 100644
--- a/WebCore/kwq/KWQFontMetrics.mm
+++ b/WebCore/kwq/KWQFontMetrics.mm
@@ -194,7 +194,8 @@ int QFontMetrics::width(const QString &qstring, int len) const
     
     CREATE_FAMILY_ARRAY(data->font(), families);
 
-    return ROUND_TO_INT([data->getRenderer() floatWidthForCharacters:(const UniChar *)qstring.unicode() stringLength:len fromCharacterPosition:0 numberOfCharacters:len withPadding: 0 applyRounding:YES attemptFontSubstitution: YES widths: 0 letterSpacing:0 wordSpacing:0 smallCaps: false fontFamilies: families]);
+    int length = len == -1 ? qstring.length() : len;
+    return ROUND_TO_INT([data->getRenderer() floatWidthForCharacters:(const UniChar *)qstring.unicode() stringLength:length fromCharacterPosition:0 numberOfCharacters:length withPadding: 0 applyRounding:YES attemptFontSubstitution: YES widths: 0 letterSpacing:0 wordSpacing:0 smallCaps: false fontFamilies: families]);
 }
 
 int QFontMetrics::width(const QChar *uchars, int len) const

-- 
WebKit Debian packaging