[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 3e34891aa3be9264f7797b85d4758726ab2d21af
Author: hyatt <hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Nov 25 08:59:04 2002 +0000

    	Don't add in the halfleading for align=texttop. That's incorrect.
    
            * khtml/rendering/render_object.cpp:
            (RenderObject::getVerticalPosition):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@2857 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index 7869efe..3534996 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,3 +1,10 @@
+2002-11-25  David Hyatt  <hyatt at apple.com>
+
+	Don't add in the halfleading for align=texttop. That's incorrect.
+	
+        * khtml/rendering/render_object.cpp:
+        (RenderObject::getVerticalPosition):
+
 2002-11-24  Maciej Stachowiak  <mjs at apple.com>
 
 	Fixed support for onLoad handlers on images - this is in
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 7869efe..3534996 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,10 @@
+2002-11-25  David Hyatt  <hyatt at apple.com>
+
+	Don't add in the halfleading for align=texttop. That's incorrect.
+	
+        * khtml/rendering/render_object.cpp:
+        (RenderObject::getVerticalPosition):
+
 2002-11-24  Maciej Stachowiak  <mjs at apple.com>
 
 	Fixed support for onLoad handlers on images - this is in
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 7869efe..3534996 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,10 @@
+2002-11-25  David Hyatt  <hyatt at apple.com>
+
+	Don't add in the halfleading for align=texttop. That's incorrect.
+	
+        * khtml/rendering/render_object.cpp:
+        (RenderObject::getVerticalPosition):
+
 2002-11-24  Maciej Stachowiak  <mjs at apple.com>
 
 	Fixed support for onLoad handlers on images - this is in
diff --git a/WebCore/khtml/rendering/render_object.cpp b/WebCore/khtml/rendering/render_object.cpp
index 1ffe785..2c52d6c 100644
--- a/WebCore/khtml/rendering/render_object.cpp
+++ b/WebCore/khtml/rendering/render_object.cpp
@@ -1064,10 +1064,8 @@ short RenderObject::getVerticalPosition( bool firstLine ) const
 //                 vpos = 0;
 
 	    const QFont &f = parent()->font( firstLine );
-            int fontheight = parent()->lineHeight( firstLine );
-            int fontsize = f.pixelSize();
-            int halfleading = ( fontheight - fontsize ) / 2;
-
+        int fontsize = f.pixelSize();
+        
 	    if ( va == SUB )
 		vpos += fontsize/5 + 1;
 	    else if ( va == SUPER )
@@ -1078,8 +1076,7 @@ short RenderObject::getVerticalPosition( bool firstLine ) const
 //                 qDebug( "CSSLH: %d, CSS_FS: %d, basepos: %d", fontheight, fontsize, parent()->baselinePosition( firstLine ) );
 //                 qDebug( "this:" );
 //                 qDebug( "CSSLH: %d, CSS_FS: %d, basepos: %d", lineHeight( firstLine ), style()->font().pixelSize(), baselinePosition( firstLine ) );
-                vpos += ( baselinePosition( firstLine ) - parent()->baselinePosition( firstLine ) +
-                        halfleading );
+                vpos += ( baselinePosition( firstLine ) - parent()->baselinePosition( firstLine ) );
 	    } else if ( va == MIDDLE ) {
 #if APPLE_CHANGES
 		vpos += - (int)(QFontMetrics(f).xHeight()/2) - lineHeight( firstLine )/2 + baselinePosition( firstLine );

-- 
WebKit Debian packaging