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

[darin]

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

            * src/kwq/KWQFontMetrics.mm: (QFontMetrics::descent): Oops, removed a - sign
            that I should have left in there.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@750 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index 6df890a..890a0a5 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,5 +1,10 @@
 2002-03-15  Darin Adler  <darin at apple.com>
 
+	* src/kwq/KWQFontMetrics.mm: (QFontMetrics::descent): Oops, removed a - sign
+	that I should have left in there.
+
+2002-03-15  Darin Adler  <darin at apple.com>
+
 	Some more optimizations. Carves another 6% or so off of NSView.html.
 
 	* src/kwq/KWQChar.mm: (QChar::QChar): Handle characters > 0x7F correctly.
@@ -24,10 +29,10 @@
 
 	* src/kwq/KWQFont.mm: (loadDefaultFont): New, used to load the default
 	font used for default-initialized QFont objects.
-	(QFont::_initializeWithFont): Don't recompute theh family name, point size, or
+	(QFont::_initializeWithFont): Don't recompute the family name, point size, or
 	traits.
 	(QFont::setFamily), (QFont::setPixelSizeFloat), (QFont::setWeight),
-	(QFont::setItalic),: autorelease the font, as we do in the destructor, since
+	(QFont::setItalic): autorelease the font, as we do in the destructor, since
 	someone could still be using the result of getFont.
 	(QFont::operator==): Add a comment about a problem with this function.
 
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 6df890a..890a0a5 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,5 +1,10 @@
 2002-03-15  Darin Adler  <darin at apple.com>
 
+	* src/kwq/KWQFontMetrics.mm: (QFontMetrics::descent): Oops, removed a - sign
+	that I should have left in there.
+
+2002-03-15  Darin Adler  <darin at apple.com>
+
 	Some more optimizations. Carves another 6% or so off of NSView.html.
 
 	* src/kwq/KWQChar.mm: (QChar::QChar): Handle characters > 0x7F correctly.
@@ -24,10 +29,10 @@
 
 	* src/kwq/KWQFont.mm: (loadDefaultFont): New, used to load the default
 	font used for default-initialized QFont objects.
-	(QFont::_initializeWithFont): Don't recompute theh family name, point size, or
+	(QFont::_initializeWithFont): Don't recompute the family name, point size, or
 	traits.
 	(QFont::setFamily), (QFont::setPixelSizeFloat), (QFont::setWeight),
-	(QFont::setItalic),: autorelease the font, as we do in the destructor, since
+	(QFont::setItalic): autorelease the font, as we do in the destructor, since
 	someone could still be using the result of getFont.
 	(QFont::operator==): Add a comment about a problem with this function.
 
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 6df890a..890a0a5 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,5 +1,10 @@
 2002-03-15  Darin Adler  <darin at apple.com>
 
+	* src/kwq/KWQFontMetrics.mm: (QFontMetrics::descent): Oops, removed a - sign
+	that I should have left in there.
+
+2002-03-15  Darin Adler  <darin at apple.com>
+
 	Some more optimizations. Carves another 6% or so off of NSView.html.
 
 	* src/kwq/KWQChar.mm: (QChar::QChar): Handle characters > 0x7F correctly.
@@ -24,10 +29,10 @@
 
 	* src/kwq/KWQFont.mm: (loadDefaultFont): New, used to load the default
 	font used for default-initialized QFont objects.
-	(QFont::_initializeWithFont): Don't recompute theh family name, point size, or
+	(QFont::_initializeWithFont): Don't recompute the family name, point size, or
 	traits.
 	(QFont::setFamily), (QFont::setPixelSizeFloat), (QFont::setWeight),
-	(QFont::setItalic),: autorelease the font, as we do in the destructor, since
+	(QFont::setItalic): autorelease the font, as we do in the destructor, since
 	someone could still be using the result of getFont.
 	(QFont::operator==): Add a comment about a problem with this function.
 
diff --git a/WebCore/kwq/KWQFontMetrics.mm b/WebCore/kwq/KWQFontMetrics.mm
index 7216a61..3b96ba2 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 7216a61..3b96ba2 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