[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 fb7d438a8448823190aa4e9b9689c811b774f440
Author: hyatt <hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Feb 4 21:33:12 2004 +0000

    	Fix a regression in the line-height of first-lines and inline-blocks.
    
            Reviewed by darin
    
            * khtml/rendering/render_flow.cpp:
            (RenderFlow::lineHeight):
            * khtml/rendering/render_text.cpp:
            (RenderText::lineHeight):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@6034 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index f93a5d7..6c8848a 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,14 @@
+2004-02-04  David Hyatt  <hyatt at apple.com>
+
+	Fix a regression in the line-height of first-lines and inline-blocks.
+	
+        Reviewed by darin
+
+        * khtml/rendering/render_flow.cpp:
+        (RenderFlow::lineHeight):
+        * khtml/rendering/render_text.cpp:
+        (RenderText::lineHeight):
+
 2004-02-02  Chris Blumenberg  <cblu at apple.com>
 
 	Fixed: <rdar://problem/3546924>: REGRESSION: dragging text or images over a WebView is jerky
diff --git a/WebCore/khtml/rendering/render_flow.cpp b/WebCore/khtml/rendering/render_flow.cpp
index 765985f..4a411de 100644
--- a/WebCore/khtml/rendering/render_flow.cpp
+++ b/WebCore/khtml/rendering/render_flow.cpp
@@ -157,9 +157,12 @@ short RenderFlow::lineHeight(bool firstLine, bool isRootLineBox) const
         RenderStyle* s = style(firstLine);
         Length lh = s->lineHeight();
         if (lh.value < 0) {
-	    if (m_lineHeight == -1)
-	      m_lineHeight = RenderObject::lineHeight(false);
-	    return m_lineHeight;
+            if (s == style()) {
+                if (m_lineHeight == -1)
+                    m_lineHeight = RenderObject::lineHeight(false);
+                return m_lineHeight;
+            }
+            return s->fontMetrics().lineSpacing();
 	}
         if (lh.isPercent())
             return lh.minWidth(s->font().pixelSize());
diff --git a/WebCore/khtml/rendering/render_text.cpp b/WebCore/khtml/rendering/render_text.cpp
index 1d2384b..9345c1a 100644
--- a/WebCore/khtml/rendering/render_text.cpp
+++ b/WebCore/khtml/rendering/render_text.cpp
@@ -1174,9 +1174,10 @@ int RenderText::height() const
     return retval;
 }
 
-short RenderText::lineHeight( bool firstLine, bool isRootLineBox) const
+short RenderText::lineHeight(bool firstLine, bool) const
 {
-    return parent()->lineHeight(firstLine, isRootLineBox);
+    // Always use the interior line height of the parent (e.g., if our parent is an inline block).
+    return parent()->lineHeight(firstLine, true);
 }
 
 short RenderText::baselinePosition( bool firstLine, bool ) const

-- 
WebKit Debian packaging