[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 1e39e214115e5857e3c42031f8c09ee20812570b
Author: hyatt <hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Nov 13 01:59:22 2002 +0000

    	Fix for 2953367, padding is incorrectly inherited into table cells
    	and also incorrectly overrides cellpadding on the table itself.
    	Fixes dailyf1.com.
    
            * khtml/css/html4.css:
            * khtml/html/html_tableimpl.cpp:
            (HTMLTableElementImpl::parseAttribute):
            (HTMLTableCellElementImpl::init):
            * khtml/html/html_tableimpl.h:
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@2647 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index ffa692f..ad43ac5 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,5 +1,17 @@
 2002-11-12  David Hyatt  <hyatt at apple.com>
 
+	Fix for 2953367, padding is incorrectly inherited into table cells
+	and also incorrectly overrides cellpadding on the table itself.
+	Fixes dailyf1.com.
+	
+        * khtml/css/html4.css:
+        * khtml/html/html_tableimpl.cpp:
+        (HTMLTableElementImpl::parseAttribute):
+        (HTMLTableCellElementImpl::init):
+        * khtml/html/html_tableimpl.h:
+
+2002-11-12  David Hyatt  <hyatt at apple.com>
+
 	For now make text/xml files use HTML parsing/documents.
 	This avoids the infinite loop we get into when loading
 	text/xml.  If/when we finally support XML, we can undo
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index ffa692f..ad43ac5 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,5 +1,17 @@
 2002-11-12  David Hyatt  <hyatt at apple.com>
 
+	Fix for 2953367, padding is incorrectly inherited into table cells
+	and also incorrectly overrides cellpadding on the table itself.
+	Fixes dailyf1.com.
+	
+        * khtml/css/html4.css:
+        * khtml/html/html_tableimpl.cpp:
+        (HTMLTableElementImpl::parseAttribute):
+        (HTMLTableCellElementImpl::init):
+        * khtml/html/html_tableimpl.h:
+
+2002-11-12  David Hyatt  <hyatt at apple.com>
+
 	For now make text/xml files use HTML parsing/documents.
 	This avoids the infinite loop we get into when loading
 	text/xml.  If/when we finally support XML, we can undo
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index ffa692f..ad43ac5 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,5 +1,17 @@
 2002-11-12  David Hyatt  <hyatt at apple.com>
 
+	Fix for 2953367, padding is incorrectly inherited into table cells
+	and also incorrectly overrides cellpadding on the table itself.
+	Fixes dailyf1.com.
+	
+        * khtml/css/html4.css:
+        * khtml/html/html_tableimpl.cpp:
+        (HTMLTableElementImpl::parseAttribute):
+        (HTMLTableCellElementImpl::init):
+        * khtml/html/html_tableimpl.h:
+
+2002-11-12  David Hyatt  <hyatt at apple.com>
+
 	For now make text/xml files use HTML parsing/documents.
 	This avoids the infinite loop we get into when loading
 	text/xml.  If/when we finally support XML, we can undo
diff --git a/WebCore/khtml/css/html4.css b/WebCore/khtml/css/html4.css
index 2d1b85a..e03e587 100644
--- a/WebCore/khtml/css/html4.css
+++ b/WebCore/khtml/css/html4.css
@@ -218,8 +218,7 @@ THEAD {
 TBODY { 
 	display: table-row-group;
 	vertical-align: inherit; 
-        border: inherit;
-	padding: inherit; 
+    border: inherit;
 }
       
 TFOOT { 
@@ -238,15 +237,13 @@ COLGROUP {
 TR { 
 	display: table-row;
 	vertical-align: inherit; 
-        border-color: inherit; 
-	padding: inherit; 
+    border-color: inherit; 
 }
       
       
 TD, TH { 
 	display: table-cell;
 	vertical-align: inherit;
-	padding: inherit;
 }
       
 TH { 
diff --git a/WebCore/khtml/html/html_tableimpl.cpp b/WebCore/khtml/html/html_tableimpl.cpp
index 3159be0..d3b27b6 100644
--- a/WebCore/khtml/html/html_tableimpl.cpp
+++ b/WebCore/khtml/html/html_tableimpl.cpp
@@ -414,18 +414,10 @@ void HTMLTableElementImpl::parseAttribute(AttributeImpl *attr)
             removeCSSProperty(CSS_PROP_BORDER_SPACING);
         break;
     case ATTR_CELLPADDING:
-        if (!attr->value().isEmpty()) {
-            addCSSLength(CSS_PROP_PADDING_TOP, attr->value());
-            addCSSLength(CSS_PROP_PADDING_LEFT, attr->value());
-            addCSSLength(CSS_PROP_PADDING_BOTTOM, attr->value());
-            addCSSLength(CSS_PROP_PADDING_RIGHT, attr->value());
-        }
-        else {
-            removeCSSProperty(CSS_PROP_PADDING_TOP);
-            removeCSSProperty(CSS_PROP_PADDING_LEFT);
-            removeCSSProperty(CSS_PROP_PADDING_BOTTOM);
-            removeCSSProperty(CSS_PROP_PADDING_RIGHT);
-        }
+        if (!attr->value().isEmpty())
+            cellPadding = attr->value();
+        else // XXXdwh Need to update all cells to remove the padding property.
+            cellPadding = "";
         break;
     case ATTR_COLS:
     {
@@ -752,6 +744,13 @@ void HTMLTableCellElementImpl::init()
             if (!m_solid)
                 addCSSProperty(CSS_PROP_BORDER_COLOR, "inherit");
         }
+        
+        if (!table->cellPadding.isEmpty()) {
+            addCSSLength(CSS_PROP_PADDING_TOP, table->cellPadding);
+            addCSSLength(CSS_PROP_PADDING_LEFT, table->cellPadding);
+            addCSSLength(CSS_PROP_PADDING_BOTTOM, table->cellPadding);
+            addCSSLength(CSS_PROP_PADDING_RIGHT, table->cellPadding);
+        }
     }
 }
 
diff --git a/WebCore/khtml/html/html_tableimpl.h b/WebCore/khtml/html/html_tableimpl.h
index 0284965..6f622d4 100644
--- a/WebCore/khtml/html/html_tableimpl.h
+++ b/WebCore/khtml/html/html_tableimpl.h
@@ -110,6 +110,8 @@ protected:
     Frame frame;
     Rules rules;
 
+    DOMString cellPadding;
+    
     bool incremental : 1;
     bool m_noBorder  : 1;
     bool m_solid     : 1;

-- 
WebKit Debian packaging