Commit e01e824b authored by rjw's avatar rjw

Fixed 3103004. REGRESSION: word-spacing/letter-spacing applied when they shouldn't be

        This was actually NOT a regression.  khtml wasn't recognizing the 'normal' value for the
        word and letter spacing properties.  So it incorrectly substituted a -1 spacing.

        * khtml/css/cssstyleselector.cpp:


git-svn-id: http://svn.webkit.org/repository/webkit/trunk@2734 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent b7bce452
2002-11-18 Richard Williamson <rjw@apple.com>
Fixed 3103004. REGRESSION: word-spacing/letter-spacing applied when they shouldn't be
This was actually NOT a regression. khtml wasn't recognizing the 'normal' value for the
word and letter spacing properties. So it incorrectly substituted a -1 spacing.
* khtml/css/cssstyleselector.cpp:
2002-11-18 David Hyatt <hyatt@apple.com>
Fix render_body's repaint method.
......
2002-11-18 Richard Williamson <rjw@apple.com>
Fixed 3103004. REGRESSION: word-spacing/letter-spacing applied when they shouldn't be
This was actually NOT a regression. khtml wasn't recognizing the 'normal' value for the
word and letter spacing properties. So it incorrectly substituted a -1 spacing.
* khtml/css/cssstyleselector.cpp:
2002-11-18 David Hyatt <hyatt@apple.com>
Fix render_body's repaint method.
......
2002-11-18 Richard Williamson <rjw@apple.com>
Fixed 3103004. REGRESSION: word-spacing/letter-spacing applied when they shouldn't be
This was actually NOT a regression. khtml wasn't recognizing the 'normal' value for the
word and letter spacing properties. So it incorrectly substituted a -1 spacing.
* khtml/css/cssstyleselector.cpp:
2002-11-18 David Hyatt <hyatt@apple.com>
Fix render_body's repaint method.
......
......@@ -2011,6 +2011,7 @@ void CSSStyleSelector::applyRule( DOM::CSSProperty *prop )
case CSS_PROP_WORD_SPACING:
{
int width = 0;
if(value->cssValueType() == CSSValue::CSS_INHERIT)
{
if(!parentNode) return;
......@@ -2026,6 +2027,8 @@ void CSSStyleSelector::applyRule( DOM::CSSProperty *prop )
default:
return;
}
} else if(primitiveValue && primitiveValue->getIdent() == CSS_VAL_NORMAL){
width = 0;
} else {
if(!primitiveValue) return;
width = primitiveValue->computeLength(style, paintDeviceMetrics);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment