[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 3ebf05ae93cfe4a8839ed831dabe7afc2cebfffc
Author: hyatt <hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Jan 22 01:45:48 2003 +0000

    	Fix for regressions on layout-tests caused by new table code.
    	Make sure cell's padding is used and not just the table's cellpadding.
    
    	Also make sure cell padding can be changed dynamically.
    
            Reviewed by darin.
    
            * khtml/rendering/table_layout.cpp:
            (AutoTableLayout::recalcColumn):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@3390 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 58c7ba8..cbf7a34 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -2,6 +2,8 @@
 
 	Fix for regressions on layout-tests caused by new table code.
 	Make sure cell's padding is used and not just the table's cellpadding.
+
+	Also make sure cell padding can be changed dynamically.
 	
         Reviewed by darin.
 
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 58c7ba8..cbf7a34 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -2,6 +2,8 @@
 
 	Fix for regressions on layout-tests caused by new table code.
 	Make sure cell's padding is used and not just the table's cellpadding.
+
+	Also make sure cell padding can be changed dynamically.
 	
         Reviewed by darin.
 
diff --git a/WebCore/khtml/html/html_tableimpl.cpp b/WebCore/khtml/html/html_tableimpl.cpp
index 61ede44..71e714c 100644
--- a/WebCore/khtml/html/html_tableimpl.cpp
+++ b/WebCore/khtml/html/html_tableimpl.cpp
@@ -457,7 +457,11 @@ void HTMLTableElementImpl::parseAttribute(AttributeImpl *attr)
         if (!attr->value().isEmpty())
             padding = kMax( 0, attr->value().toInt() );
         else
-            padding = 0;
+            padding = 1;
+        if (m_render && m_render->isTable()) {
+            static_cast<RenderTable *>(m_render)->setCellPadding(padding);
+            m_render->setLayouted(false);
+        }
         break;
     case ATTR_COLS:
     {
diff --git a/WebCore/khtml/rendering/table_layout.cpp b/WebCore/khtml/rendering/table_layout.cpp
index 656d2a1..83a9d9c 100644
--- a/WebCore/khtml/rendering/table_layout.cpp
+++ b/WebCore/khtml/rendering/table_layout.cpp
@@ -399,8 +399,7 @@ void AutoTableLayout::recalcColumn( int effCol )
 		    case Fixed:
 			// ignore width=0
 			if ( w.value > 0 && (int)l.width.type != Percent ) {
-                            // ### we should use box'es paddings here I guess.
-                            int wval = w.value + table->cellPadding() * 2;
+                            int wval = w.value + (cell->paddingLeft()+cell->paddingRight());
 			    if ( l.width.type == Fixed ) {
                                 // Nav/IE weirdness
 				if ((wval > l.width.value) ||

-- 
WebKit Debian packaging