[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677

[rjw]

The following commit has been merged in the debian/unstable branch:
commit e01e824bd98e1d79f0e1c53ca78d1c3b51e44cbf
Author: rjw <rjw at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Nov 18 20:30:23 2002 +0000

            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

diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index a2802d8..00313ca 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,3 +1,11 @@
+2002-11-18  Richard Williamson   <rjw at 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 at apple.com>
 
 	Fix render_body's repaint method.
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index a2802d8..00313ca 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,11 @@
+2002-11-18  Richard Williamson   <rjw at 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 at apple.com>
 
 	Fix render_body's repaint method.
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index a2802d8..00313ca 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,11 @@
+2002-11-18  Richard Williamson   <rjw at 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 at apple.com>
 
 	Fix render_body's repaint method.
diff --git a/WebCore/khtml/css/cssstyleselector.cpp b/WebCore/khtml/css/cssstyleselector.cpp
index 1483d32..4fda0f7 100644
--- a/WebCore/khtml/css/cssstyleselector.cpp
+++ b/WebCore/khtml/css/cssstyleselector.cpp
@@ -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);

-- 
WebKit Debian packaging