[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 e1c12ccaa2bb086b085a0bcec04ea4924c7bbff9
Author: hyatt <hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Feb 18 22:03:01 2003 +0000

    	Fix for 3176102, bad table cell regression.  I was adding in
    	random properties for cells. Eep.
    
            Reviewed by gramps
    
            * khtml/css/cssstyleselector.cpp:
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@3662 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 90fca0f..8d8a7c9 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,5 +1,14 @@
 2003-02-18  David Hyatt  <hyatt at apple.com>
 
+	Fix for 3176102, bad table cell regression.  I was adding in
+	random properties for cells. Eep.
+	
+        Reviewed by gramps
+
+        * khtml/css/cssstyleselector.cpp:
+        
+2003-02-18  David Hyatt  <hyatt at apple.com>
+
 	Fix for 3171795, dotted borders drawn incorrectly.  Picked this
 	gem up from the KHTML trunk.
 	
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 90fca0f..8d8a7c9 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,5 +1,14 @@
 2003-02-18  David Hyatt  <hyatt at apple.com>
 
+	Fix for 3176102, bad table cell regression.  I was adding in
+	random properties for cells. Eep.
+	
+        Reviewed by gramps
+
+        * khtml/css/cssstyleselector.cpp:
+        
+2003-02-18  David Hyatt  <hyatt at apple.com>
+
 	Fix for 3171795, dotted borders drawn incorrectly.  Picked this
 	gem up from the KHTML trunk.
 	
diff --git a/WebCore/khtml/css/cssstyleselector.cpp b/WebCore/khtml/css/cssstyleselector.cpp
index 426ab50..06eb1e2 100644
--- a/WebCore/khtml/css/cssstyleselector.cpp
+++ b/WebCore/khtml/css/cssstyleselector.cpp
@@ -458,7 +458,8 @@ RenderStyle *CSSStyleSelector::styleForElement(ElementImpl *e)
     return style;
 }
 
-unsigned int CSSStyleSelector::addInlineDeclarations(DOM::ElementImpl* e, DOM::CSSStyleDeclarationImpl *decl,
+unsigned int CSSStyleSelector::addInlineDeclarations(DOM::ElementImpl* e,
+                                                     DOM::CSSStyleDeclarationImpl *decl,
                                                      unsigned int numProps)
 {
     CSSStyleDeclarationImpl* addDecls = 0;
@@ -490,8 +491,8 @@ unsigned int CSSStyleSelector::addInlineDeclarations(DOM::ElementImpl* e, DOM::C
     {
         if (i == firstLen)
             values = addValues;
-        
-        CSSProperty *prop = values->at(i);
+
+        CSSProperty *prop = values->at(i >= firstLen ? i - firstLen : i);
 	Source source = Inline;
 
         if( prop->m_bImportant ) source = InlineImportant;
diff --git a/WebCore/khtml/html/html_tableimpl.cpp b/WebCore/khtml/html/html_tableimpl.cpp
index ecee30f..9abb1b4 100644
--- a/WebCore/khtml/html/html_tableimpl.cpp
+++ b/WebCore/khtml/html/html_tableimpl.cpp
@@ -102,7 +102,7 @@ DOM::CSSStyleDeclarationImpl* HTMLTableElementImpl::createSharedCellDecls()
             m_sharedCellDecls->setProperty(CSS_PROP_BORDER_BOTTOM_STYLE, v, false, true);
             m_sharedCellDecls->setProperty(CSS_PROP_BORDER_LEFT_STYLE, v, false, true);
             m_sharedCellDecls->setProperty(CSS_PROP_BORDER_RIGHT_STYLE, v, false, true);
-            m_sharedCellDecls->setProperty(CSS_PROP_BORDER_COLOR, "inherit", false, true);
+            m_sharedCellDecls->setProperty(CSS_PROP_BORDER_COLOR, CSS_VAL_INHERIT, false, true);
         }
     }
     

-- 
WebKit Debian packaging