[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 19a2c1121693d543fd13265c380795a0261009b6
Author: hyatt <hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Jul 25 22:11:41 2002 +0000

    	Fix for huge white space problem on appleturns.com, bug 2947818.  Vertical-align
    	was being applied to block-level elts in violation of the CSS2 spec.  Vertical-align
    	is only supposed to apply to inline-level elts and table cells.  getVerticalPosition
    	will now bail if the element is block-level.
    
            * khtml/rendering/render_object.cpp:
            (RenderObject::getVerticalPosition):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@1670 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index 1916d2b..3db552a 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,3 +1,13 @@
+2002-07-25  David Hyatt  <hyatt at apple.com>
+
+	Fix for huge white space problem on appleturns.com, bug 2947818.  Vertical-align
+	was being applied to block-level elts in violation of the CSS2 spec.  Vertical-align
+	is only supposed to apply to inline-level elts and table cells.  getVerticalPosition
+	will now bail if the element is block-level.
+	
+        * khtml/rendering/render_object.cpp:
+        (RenderObject::getVerticalPosition):
+
 2002-07-25  Chris Blumenberg  <cblu at apple.com>
 
         * kwq/WebCoreBridge.h:
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 1916d2b..3db552a 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,13 @@
+2002-07-25  David Hyatt  <hyatt at apple.com>
+
+	Fix for huge white space problem on appleturns.com, bug 2947818.  Vertical-align
+	was being applied to block-level elts in violation of the CSS2 spec.  Vertical-align
+	is only supposed to apply to inline-level elts and table cells.  getVerticalPosition
+	will now bail if the element is block-level.
+	
+        * khtml/rendering/render_object.cpp:
+        (RenderObject::getVerticalPosition):
+
 2002-07-25  Chris Blumenberg  <cblu at apple.com>
 
         * kwq/WebCoreBridge.h:
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 1916d2b..3db552a 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,13 @@
+2002-07-25  David Hyatt  <hyatt at apple.com>
+
+	Fix for huge white space problem on appleturns.com, bug 2947818.  Vertical-align
+	was being applied to block-level elts in violation of the CSS2 spec.  Vertical-align
+	is only supposed to apply to inline-level elts and table cells.  getVerticalPosition
+	will now bail if the element is block-level.
+	
+        * khtml/rendering/render_object.cpp:
+        (RenderObject::getVerticalPosition):
+
 2002-07-25  Chris Blumenberg  <cblu at apple.com>
 
         * kwq/WebCoreBridge.h:
diff --git a/WebCore/khtml/rendering/render_object.cpp b/WebCore/khtml/rendering/render_object.cpp
index 45c94b0..d2c19ef 100644
--- a/WebCore/khtml/rendering/render_object.cpp
+++ b/WebCore/khtml/rendering/render_object.cpp
@@ -899,6 +899,7 @@ short RenderObject::getVerticalPosition( bool firstLine ) const
     // vertical align for table cells has a different meaning
     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;
@@ -906,7 +907,7 @@ short RenderObject::getVerticalPosition( bool firstLine ) const
 	    vpos = PositionBottom;
 	} else if ( va == LENGTH ) {
 	    vpos = -style()->verticalAlignLength().width( lineHeight( firstLine ) );
-	} else if ( parent() && parent()->childrenInline() ) {
+	} else  {
 	    vpos = parent()->verticalPositionHint( firstLine );
 	    // don't allow elements nested inside text-top to have a different valignment.
 	    if ( va == BASELINE )
@@ -946,6 +947,7 @@ short RenderObject::getVerticalPosition( bool firstLine ) const
 	    } else if ( va == BASELINE_MIDDLE )
 		vpos += - lineHeight( firstLine )/2 + baselinePosition( firstLine );
 	}
+      }
     }
     return vpos;
 }

-- 
WebKit Debian packaging