[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 6b6e33dfdcc213c06d6b36d149c4491f163b6312
Author: hyatt <hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Feb 26 00:34:28 2003 +0000

    	Fix for bug 3166276.  <tt> uses wrong font size inside a table.
    	Make sure logical font values like "medium" don't set the "size
    	specified" bit on the font, so that the generic family change
    	code will get activated.
    
            Reviewed by darin
    
            * khtml/css/cssstyleselector.cpp:
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@3697 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index d946127..b6a7bab 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,14 @@
+2003-02-25  David Hyatt  <hyatt at apple.com>
+
+	Fix for bug 3166276.  <tt> uses wrong font size inside a table.
+	Make sure logical font values like "medium" don't set the "size
+	specified" bit on the font, so that the generic family change
+	code will get activated.
+	
+        Reviewed by darin
+
+        * khtml/css/cssstyleselector.cpp:
+
 2003-02-25  Darin Adler  <darin at apple.com>
 
         Reviewed by me, changes by Dave.
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index d946127..b6a7bab 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,14 @@
+2003-02-25  David Hyatt  <hyatt at apple.com>
+
+	Fix for bug 3166276.  <tt> uses wrong font size inside a table.
+	Make sure logical font values like "medium" don't set the "size
+	specified" bit on the font, so that the generic family change
+	code will get activated.
+	
+        Reviewed by darin
+
+        * khtml/css/cssstyleselector.cpp:
+
 2003-02-25  Darin Adler  <darin at apple.com>
 
         Reviewed by me, changes by Dave.
diff --git a/WebCore/khtml/css/cssstyleselector.cpp b/WebCore/khtml/css/cssstyleselector.cpp
index 1d15585..bcd0827 100644
--- a/WebCore/khtml/css/cssstyleselector.cpp
+++ b/WebCore/khtml/css/cssstyleselector.cpp
@@ -2526,9 +2526,9 @@ void CSSStyleSelector::applyRule( int id, DOM::CSSValueImpl *value )
         } else
             oldSize = m_fontSizes[3];
 
-        if(value->cssValueType() == CSSValue::CSS_INHERIT) {
+        if (value->cssValueType() == CSSValue::CSS_INHERIT) {
             size = oldSize;
-        } else if(primitiveValue->getIdent()) {
+        } else if (primitiveValue->getIdent()) {
 	    // keywords are being used.  Pick the correct default
 	    // based off the font family.
 	    QValueList<int>& fontSizes = (fontDef.genericFamily == FontDef::eMonospace) ?
@@ -2555,7 +2555,13 @@ void CSSStyleSelector::applyRule( int id, DOM::CSSValueImpl *value )
                 return;
             }
 
+            // This is a "logical" font size in the sense that it is relative to some UA default.
+            // Since the UA default can vary depending on the font family (e.g., monospace could be 11pt
+            // but serif could be 20pt), we don't set our size specified bit.
+            fontDef.sizeSpecified = false;
+
         } else {
+            fontDef.sizeSpecified = true;
             int type = primitiveValue->primitiveType();
             if(type > CSSPrimitiveValue::CSS_PERCENTAGE && type < CSSPrimitiveValue::CSS_DEG) {
                 size = primitiveValue->computeLengthFloat(parentStyle, paintDeviceMetrics);
@@ -2575,8 +2581,7 @@ void CSSStyleSelector::applyRule( int id, DOM::CSSValueImpl *value )
 
         //kdDebug( 6080 ) << "computed raw font size: " << size << endl;
 
-        fontDef.sizeSpecified = true;
-	fontDef.size = int(size);
+        fontDef.size = int(size);
         if (style->setFontDef( fontDef ))
 	    fontDirty = true;
         return;

-- 
WebKit Debian packaging