Changeset 16315 in webkit

Timestamp:

Sep 11, 2006 9:52:50 PM (18 years ago)

Author:

hyatt

Message:

Fix for bug 8126, column widths apply to the border boxes of cells.

Reviewed by aroben

• rendering/RenderTableCell.cpp: (WebCore::RenderTableCell::styleOrColWidth):

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• rendering/RenderTableCell.cpp (modified) (1 diff)

trunk/WebCore/ChangeLog

@@ +1 @@
+2006-09-11  David Hyatt  <hyatt@apple.com>
+
+        Fix for bug 8126, column widths apply to the border boxes of cells.
+
+        Reviewed by aroben
+
+        * rendering/RenderTableCell.cpp:
+        (WebCore::RenderTableCell::styleOrColWidth):
+
 2006-09-11  Nikolas Zimmermann  <zimmermann@kde.org>
 

trunk/WebCore/rendering/RenderTableCell.cpp

@@ -81 +81 @@
         return w;
     RenderTableCol* col = table()->colElement(_col);
-    if (col)
+    if (col) {
         w = col->style()->width();
+        
+        // Column widths specified on <col> apply to the border box of the cell.
+        // Percentages don't need to be handled since they're always treated this way (even when specified on the cells).
+        // See Bugzilla bug 8126 for details.
+        if (w.isFixed() && w.value() > 0)
+            w = Length(max(0, w.value() - borderLeft() - borderRight() - paddingLeft() - paddingRight()), Fixed);
+    }
     return w;
 }