[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 05:57:33 UTC 2009


The following commit has been merged in the debian/unstable branch:
commit 9ab02a10fad95ee5dc46ac3933307e3f058390d1
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Mar 15 19:09:08 2002 +0000

    Oops again.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@751 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/kwq/KWQFontMetrics.mm b/WebCore/kwq/KWQFontMetrics.mm
index 3b96ba2..30b6d2d 100644
--- a/WebCore/kwq/KWQFontMetrics.mm
+++ b/WebCore/kwq/KWQFontMetrics.mm
@@ -368,7 +368,7 @@ int QFontMetrics::ascent() const
 int QFontMetrics::descent() const
 {
     if (data->descent < 0)
-        data->descent = -ROUND_TO_INT([data->font descender]);
+        data->descent = ROUND_TO_INT(-[data->font descender]);
     return data->descent;
 }
 
diff --git a/WebCore/src/kwq/KWQFontMetrics.mm b/WebCore/src/kwq/KWQFontMetrics.mm
index 3b96ba2..30b6d2d 100644
--- a/WebCore/src/kwq/KWQFontMetrics.mm
+++ b/WebCore/src/kwq/KWQFontMetrics.mm
@@ -368,7 +368,7 @@ int QFontMetrics::ascent() const
 int QFontMetrics::descent() const
 {
     if (data->descent < 0)
-        data->descent = -ROUND_TO_INT([data->font descender]);
+        data->descent = ROUND_TO_INT(-[data->font descender]);
     return data->descent;
 }
 

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list