[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 009044ff3cbc25146b128fced5f112bffc150db1
Author: rjw <rjw at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Nov 21 21:19:12 2002 +0000

            Fixed performance regression!  Argh.
    
            * khtml/rendering/font.cpp:
            (Font::width):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@2805 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index e5fa9ec..7d39fe3 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,3 +1,10 @@
+2002-11-21  Richard Williamson   <rjw at apple.com>
+
+        Fixed performance regression!  Argh.
+        
+        * khtml/rendering/font.cpp:
+        (Font::width):
+
 2002-11-21  Darin Adler  <darin at apple.com>
 
         * force-js-clean-timestamp: Trigger a rebuild because of the
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index e5fa9ec..7d39fe3 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,10 @@
+2002-11-21  Richard Williamson   <rjw at apple.com>
+
+        Fixed performance regression!  Argh.
+        
+        * khtml/rendering/font.cpp:
+        (Font::width):
+
 2002-11-21  Darin Adler  <darin at apple.com>
 
         * force-js-clean-timestamp: Trigger a rebuild because of the
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index e5fa9ec..7d39fe3 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,10 @@
+2002-11-21  Richard Williamson   <rjw at apple.com>
+
+        Fixed performance regression!  Argh.
+        
+        * khtml/rendering/font.cpp:
+        (Font::width):
+
 2002-11-21  Darin Adler  <darin at apple.com>
 
         * force-js-clean-timestamp: Trigger a rebuild because of the
diff --git a/WebCore/khtml/rendering/font.cpp b/WebCore/khtml/rendering/font.cpp
index 84aa396..55ea0ef 100644
--- a/WebCore/khtml/rendering/font.cpp
+++ b/WebCore/khtml/rendering/font.cpp
@@ -121,7 +121,8 @@ int Font::width( QChar *chs, int slen, int pos, int len ) const
 #ifndef ROUND_TO_INT
 #define ROUND_TO_INT(x) (unsigned int)((x)+.5)
 #endif
-    return ROUND_TO_INT(fm.floatWidth(chs, slen, pos, len, letterSpacing, wordSpacing));
+    return ROUND_TO_INT(fm.floatWidth(chs+pos, slen-pos, 0, len, letterSpacing, wordSpacing));
+//    return fm.width(chs + pos, len);
 #else
     QString qstr = QConstString(chs+pos, len).string();
     // hack for fonts that don't have a welldefined nbsp
@@ -154,7 +155,8 @@ int Font::width( QChar *chs, int slen, int pos, int len ) const
 int Font::width( QChar *chs, int slen, int pos ) const
 {
 #if APPLE_CHANGES
-    return ROUND_TO_INT(fm.floatWidth(chs, slen, pos, 1, letterSpacing, wordSpacing));
+//    return ROUND_TO_INT(fm.floatWidth(chs, slen, pos, 1, letterSpacing, wordSpacing));
+    return width(chs, slen, pos, 1);
 #else
     int w;
     if ( !fontDef.hasNbsp && (chs+pos)->unicode() == 0xa0 )

-- 
WebKit Debian packaging