[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 fa649fbee249d215093c86aca7977d8f971d0ad1
Author: hyatt <hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Oct 14 19:47:25 2003 +0000

    	Fix an obvious little typo with smallCaps inheritance.  Richard reviewed.
    
    	Also merge in Dirk's patch to fix a crasher caused by an obvious deref mistake.
    
            Reviewed by rjw and nobody
    
            * khtml/css/cssstyleselector.cpp:
            (khtml::convertToLength):
            (khtml::CSSStyleSelector::applyRule):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@5183 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 958b3dc..00ad4dc 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,15 @@
+2003-10-14  David Hyatt  <hyatt at apple.com>
+
+	Fix an obvious little typo with smallCaps inheritance.  Richard reviewed.
+
+	Also merge in Dirk's patch to fix a crasher caused by an obvious deref mistake.
+	
+        Reviewed by rjw and nobody
+
+        * khtml/css/cssstyleselector.cpp:
+        (khtml::convertToLength):
+        (khtml::CSSStyleSelector::applyRule):
+
 2003-10-14  Ken Kocienda  <kocienda at apple.com>
 
         Reviewed by Hyatt
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 958b3dc..00ad4dc 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,15 @@
+2003-10-14  David Hyatt  <hyatt at apple.com>
+
+	Fix an obvious little typo with smallCaps inheritance.  Richard reviewed.
+
+	Also merge in Dirk's patch to fix a crasher caused by an obvious deref mistake.
+	
+        Reviewed by rjw and nobody
+
+        * khtml/css/cssstyleselector.cpp:
+        (khtml::convertToLength):
+        (khtml::CSSStyleSelector::applyRule):
+
 2003-10-14  Ken Kocienda  <kocienda at apple.com>
 
         Reviewed by Hyatt
diff --git a/WebCore/khtml/css/cssstyleselector.cpp b/WebCore/khtml/css/cssstyleselector.cpp
index 8e3359c..57d5c99 100644
--- a/WebCore/khtml/css/cssstyleselector.cpp
+++ b/WebCore/khtml/css/cssstyleselector.cpp
@@ -1376,7 +1376,7 @@ static Length convertToLength( CSSPrimitiveValueImpl *primitiveValue, RenderStyl
 {
     Length l;
     if ( !primitiveValue ) {
-	if ( *ok )
+	if ( ok )
 	    *ok = false;
     } else {
 	int type = primitiveValue->primitiveType();
@@ -1826,7 +1826,7 @@ void CSSStyleSelector::applyRule( int id, DOM::CSSValueImpl *value )
         FontDef fontDef = style->htmlFont().fontDef;
         if(value->cssValueType() == CSSValue::CSS_INHERIT) {
             if(!parentNode) return;
-            fontDef.smallCaps = parentStyle->htmlFont().fontDef.weight;
+            fontDef.smallCaps = parentStyle->htmlFont().fontDef.smallCaps;
         } else {
             if(!primitiveValue) return;
             int id = primitiveValue->getIdent();

-- 
WebKit Debian packaging