[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 ffd0d177bfeb56955dd804405cb97523d02eb3ad
Author: hyatt <hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Mar 11 09:19:17 2003 +0000

    	Fix the 16000 pixel tall scrollbar on macromedia.com/software.
    	vertical-align position hints were being set to bad values.
    
            Reviewed by mjs
    
            * khtml/rendering/render_object.cpp:
            (RenderObject::getVerticalPosition):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@3795 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 9b3efd3..53fb192 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,13 @@
+2003-03-11  David Hyatt  <hyatt at apple.com>
+
+	Fix the 16000 pixel tall scrollbar on macromedia.com/software.
+	vertical-align position hints were being set to bad values.
+	
+        Reviewed by mjs
+
+        * khtml/rendering/render_object.cpp:
+        (RenderObject::getVerticalPosition):
+
 2003-03-10  David Hyatt  <hyatt at apple.com>
 
 	Fix for <pre> regression, bug #3193590, directory listings
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 9b3efd3..53fb192 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,13 @@
+2003-03-11  David Hyatt  <hyatt at apple.com>
+
+	Fix the 16000 pixel tall scrollbar on macromedia.com/software.
+	vertical-align position hints were being set to bad values.
+	
+        Reviewed by mjs
+
+        * khtml/rendering/render_object.cpp:
+        (RenderObject::getVerticalPosition):
+
 2003-03-10  David Hyatt  <hyatt at apple.com>
 
 	Fix for <pre> regression, bug #3193590, directory listings
diff --git a/WebCore/khtml/rendering/render_object.cpp b/WebCore/khtml/rendering/render_object.cpp
index 07d6f8b..53ded75 100644
--- a/WebCore/khtml/rendering/render_object.cpp
+++ b/WebCore/khtml/rendering/render_object.cpp
@@ -1264,56 +1264,56 @@ short RenderObject::verticalPositionHint( bool firstLine ) const
 
 short RenderObject::getVerticalPosition( bool firstLine ) const
 {
-    // vertical align for table cells has a different meaning
+    if (!isInline())
+        return 0;
+
+    // This method determines the vertical position for inline elements.
     int vpos = 0;
-    if ( !isTableCell() ) {
-      if (parent() && parent()->childrenInline()) { // Vertical-align only has meaning for inline elements and table cells. -dwh
-	EVerticalAlign va = style()->verticalAlign();
-	if ( va == TOP ) {
-	    vpos = PositionTop;
-	} else if ( va == BOTTOM ) {
-	    vpos = PositionBottom;
-	} else if ( va == LENGTH ) {
-	    vpos = -style()->verticalAlignLength().width( lineHeight( firstLine ) );
-	} else  {
-	    vpos = parent()->verticalPositionHint( firstLine );
-	    // don't allow elements nested inside text-top to have a different valignment.
-	    if ( va == BASELINE )
-		return vpos;
-
-        //     if ( vpos == PositionTop )
+    EVerticalAlign va = style()->verticalAlign();
+    if ( va == TOP ) {
+        vpos = PositionTop;
+    } else if ( va == BOTTOM ) {
+        vpos = PositionBottom;
+    } else if ( va == LENGTH ) {
+        vpos = -style()->verticalAlignLength().width( lineHeight( firstLine ) );
+    } else  {
+        vpos = parent()->verticalPositionHint( firstLine );
+        // don't allow elements nested inside text-top to have a different valignment.
+        if ( va == BASELINE )
+            return vpos;
+
+    //     if ( vpos == PositionTop )
 //                 vpos = 0;
 
-	    const QFont &f = parent()->font( firstLine );
+        const QFont &f = parent()->font( firstLine );
         int fontsize = f.pixelSize();
-        
-	    if ( va == SUB )
-		vpos += fontsize/5 + 1;
-	    else if ( va == SUPER )
-		vpos -= fontsize/3 + 1;
-	    else if ( va == TEXT_TOP ) {
+    
+        if ( va == SUB )
+            vpos += fontsize/5 + 1;
+        else if ( va == SUPER )
+            vpos -= fontsize/3 + 1;
+        else if ( va == TEXT_TOP ) {
 //                 qDebug( "got TEXT_TOP vertical pos hint" );
 //                 qDebug( "parent:" );
 //                 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 ) );
-	    } else if ( va == MIDDLE ) {
+            vpos += ( baselinePosition( firstLine ) - parent()->baselinePosition( firstLine ) );
+        } else if ( va == MIDDLE ) {
 #if APPLE_CHANGES
-		vpos += - (int)(QFontMetrics(f).xHeight()/2) - lineHeight( firstLine )/2 + baselinePosition( firstLine );
+            vpos += - (int)(QFontMetrics(f).xHeight()/2) - lineHeight( firstLine )/2 + baselinePosition( firstLine );
 #else
-		QRect b = QFontMetrics(f).boundingRect('x');
-		vpos += -b.height()/2 - lineHeight( firstLine )/2 + baselinePosition( firstLine );
+            QRect b = QFontMetrics(f).boundingRect('x');
+            vpos += -b.height()/2 - lineHeight( firstLine )/2 + baselinePosition( firstLine );
 #endif
-	    } else if ( va == TEXT_BOTTOM ) {
-		vpos += QFontMetrics(f).descent();
-		if ( !isReplaced() )
-		    vpos -= fontMetrics(firstLine).descent();
-	    } else if ( va == BASELINE_MIDDLE )
-		vpos += - lineHeight( firstLine )/2 + baselinePosition( firstLine );
-	}
-      }
+        } else if ( va == TEXT_BOTTOM ) {
+            vpos += QFontMetrics(f).descent();
+            if ( !isReplaced() )
+                vpos -= fontMetrics(firstLine).descent();
+        } else if ( va == BASELINE_MIDDLE )
+            vpos += - lineHeight( firstLine )/2 + baselinePosition( firstLine );
     }
+    
     return vpos;
 }
 

-- 
WebKit Debian packaging