Changeset 3952 in webkit

Timestamp:

Mar 27, 2003, 6:17:17 PM (22 years ago)

Author:

hyatt

Message:

A collection of fixes for tables.

(1) Fixed table layout should only be used if an explicit width
is specified on a table.
(2) width="0" and height="0" should be ignored on table cells!
(3) Fixed table layout wasn't spreading extra space over
columns.

Reviewed by mjs

• khtml/html/html_tableimpl.cpp: (HTMLTableCellElementImpl::parseAttribute):
• khtml/rendering/render_table.cpp: (RenderTable::setStyle):
• khtml/rendering/table_layout.cpp: (FixedTableLayout::layout):

Location:

trunk/WebCore

Files:

• ChangeLog-2003-10-25 (modified) (1 diff)
• ChangeLog-2005-08-23 (modified) (1 diff)
• khtml/html/html_tableimpl.cpp (modified) (1 diff)
• khtml/rendering/render_table.cpp (modified) (1 diff)
• khtml/rendering/table_layout.cpp (modified) (4 diffs)

trunk/WebCore/ChangeLog-2003-10-25

@@ +1 @@
+2003-03-27  David Hyatt  <hyatt@apple.com>
+
+        A collection of fixes for tables.
+
+        (1) Fixed table layout should only be used if an explicit width
+        is specified on a table.
+        (2) width="0" and height="0" should be ignored on table cells!
+        (3) Fixed table layout wasn't spreading extra space over 
+        columns.
+        
+        Reviewed by mjs
+
+        * khtml/html/html_tableimpl.cpp:
+        (HTMLTableCellElementImpl::parseAttribute):
+        * khtml/rendering/render_table.cpp:
+        (RenderTable::setStyle):
+        * khtml/rendering/table_layout.cpp:
+        (FixedTableLayout::layout):
+
 2003-03-27  David Hyatt  <hyatt@apple.com>
 

trunk/WebCore/ChangeLog-2005-08-23

@@ +1 @@
+2003-03-27  David Hyatt  <hyatt@apple.com>
+
+        A collection of fixes for tables.
+
+        (1) Fixed table layout should only be used if an explicit width
+        is specified on a table.
+        (2) width="0" and height="0" should be ignored on table cells!
+        (3) Fixed table layout wasn't spreading extra space over 
+        columns.
+        
+        Reviewed by mjs
+
+        * khtml/html/html_tableimpl.cpp:
+        (HTMLTableCellElementImpl::parseAttribute):
+        * khtml/rendering/render_table.cpp:
+        (RenderTable::setStyle):
+        * khtml/rendering/table_layout.cpp:
+        (FixedTableLayout::layout):
+
 2003-03-27  David Hyatt  <hyatt@apple.com>
 

trunk/WebCore/khtml/html/html_tableimpl.cpp

@@ -855 +855 @@
         break;
     case ATTR_WIDTH:
-        if (!attr->value().isEmpty())
-            addCSSLength( CSS_PROP_WIDTH, attr->value() );
+        if (!attr->value().isEmpty()) {
+            int widthInt = attr->val()->toInt();
+            if (widthInt > 0) // width="0" is ignored for compatibility with WinIE.
+                addCSSLength( CSS_PROP_WIDTH, attr->value() );
+        }
         else
             removeCSSProperty(CSS_PROP_WIDTH);
+        break;
+    case ATTR_HEIGHT:
+        if (!attr->value().isEmpty()) {
+            int heightInt = attr->val()->toInt();
+            if (heightInt > 0) // height="0" is ignored for compatibility with WinIE.
+                addCSSLength( CSS_PROP_HEIGHT, attr->value() );
+        }
+        else
+            removeCSSProperty(CSS_PROP_HEIGHT);
         break;
     case ATTR_NOSAVE:

trunk/WebCore/khtml/rendering/render_table.cpp

@@ -92 +92 @@
         delete tableLayout;
 
-        if (style()->tableLayout() == TFIXED ) {
+        // According to the CSS2 spec, you only use fixed table layout if an
+        // explicit width is specified on the table.  Auto width implies auto table layout.
+        if (style()->tableLayout() == TFIXED && !style()->width().isVariable()) {
             tableLayout = new FixedTableLayout(this);
 #ifdef DEBUG_LAYOUT

trunk/WebCore/khtml/rendering/table_layout.cpp

@@ -264 +264 @@
     int available = tableWidth;
     int nEffCols = table->numEffCols();
+    int totalPercent = 0;
+    
 #ifdef DEBUG_LAYOUT
     qDebug("FixedTableLayout::layout: tableWidth=%d, numEffCols=%d",  tableWidth, nEffCols);
@@ -273 +275 @@
     calcWidth.fill( -1 );
 
-    // first assign  fixed width
-    for ( int i = 0; i < nEffCols; i++ ) {
-        if ( width[i].type == Fixed ) {
-            calcWidth[i] = width[i].value;
-            available -= width[i].value;
-        }
-    }
-
     // assign  percent width
     if ( available > 0 ) {
-        int totalPercent = 0;
-        for ( int i = 0; i < nEffCols; i++ )
-            if ( width[i].type == Percent )
-                totalPercent += width[i].value;
-
-        // calculate how much to distribute to percent cells.
-        int base = tableWidth * totalPercent / 100;
-        if ( base > available )
-            base = available;
-        else
-            totalPercent = 100;
-
-#ifdef DEBUG_LAYOUT
-    qDebug("FixedTableLayout::layout: assigning percent width, base=%d, totalPercent=%d", base, totalPercent);
+        for ( int i = 0; i < nEffCols; i++ )
+            if ( width[i].type == Percent )
+                totalPercent += width[i].value;
+
+        // calculate how much to distribute to percent cells.
+        int base = tableWidth * totalPercent / 100;
+        if ( base > available )
+            base = available;
+        else
+            totalPercent = 100;
+
+#ifdef DEBUG_LAYOUT
+        qDebug("FixedTableLayout::layout: assigning percent width, base=%d, totalPercent=%d", base, totalPercent);
 #endif
         for ( int i = 0; available > 0 && i < nEffCols; i++ ) {
@@ -306 +299 @@
         }
     }
-
-    // assign  variable width
+    
+    // next assign fixed width
+    for ( int i = 0; i < nEffCols; i++ ) {
+        if ( width[i].type == Fixed ) {
+            calcWidth[i] = width[i].value;
+            available -= width[i].value;
+        }
+    }
+
+    // assign variable width
     if ( available > 0 ) {
         int totalVariable = 0;
@@ -328 +329 @@
             calcWidth[i] = 0; // IE gives min 1 px...
 
+    // spread extra space over columns
+    if ( available > 0 ) {
+        int total = nEffCols;
+        // still have some width to spread
+        int i = nEffCols;
+        while (  i-- ) {
+            int w = available / total;
+            available -= w;
+            total--;
+            calcWidth[i] += w;
+        }
+    }
+    
     int pos = 0;
     int spacing = table->cellSpacing();