[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 026ba570eb420817cb0213b34accc839b823549f
Author: hyatt <hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Nov 3 22:43:22 2003 +0000

    	Fix for 3472030, line-height not properly reset in all cases when the font shorthand is used.
    
            Reviewed by mjs
    
            * khtml/css/cssparser.cpp:
            (CSSParser::parseFont):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@5369 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 1e935e1..7bd4658 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,12 @@
+2003-11-03  David Hyatt  <hyatt at apple.com>
+
+	Fix for 3472030, line-height not properly reset in all cases when the font shorthand is used.
+	
+        Reviewed by mjs
+
+        * khtml/css/cssparser.cpp:
+        (CSSParser::parseFont):
+
 2003-11-03  Maciej Stachowiak  <mjs at apple.com>
 
         Reviewed by Darin.
diff --git a/WebCore/khtml/css/cssparser.cpp b/WebCore/khtml/css/cssparser.cpp
index 0eb6742..fedab19 100644
--- a/WebCore/khtml/css/cssparser.cpp
+++ b/WebCore/khtml/css/cssparser.cpp
@@ -1513,9 +1513,10 @@ bool CSSParser::parseFont( bool important )
 	value = valueList->next();
 	if ( !value )
 	    goto invalid;
-    } else {
-	font->lineHeight = new CSSPrimitiveValueImpl( CSS_VAL_NORMAL );
     }
+    
+    if (!font->lineHeight)
+	font->lineHeight = new CSSPrimitiveValueImpl( CSS_VAL_NORMAL );
 
 //     kdDebug( 6080 ) << "  got line height current=" << valueList->currentValue << endl;
     // font family must come now

-- 
WebKit Debian packaging