Changeset 56319 in webkit

Timestamp:

Mar 21, 2010 3:19:27 PM (14 years ago)

Author:

ddkilzer@apple.com

Message:

<​http://webkit.org/b/14858> <col> width ignored when not tied to a single cell

Patch by Dmitry Gorbik <​socket.h@gmail.com> on 2010-03-21
Reviewed by David Kilzer.

Fixed width calculation for cells with span when <col> is defined.

WebCore:

Test: fast/table/col-width-span-expand.html

• rendering/RenderTableCell.cpp:

(WebCore::RenderTableCell::styleOrColWidth): Added the calculation of cell width
in case of <col> defined and span > 1.

LayoutTests:

• fast/table/col-width-span-expand-expected.txt: Added.
• fast/table/col-width-span-expand.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/table/col-width-span-expand-expected.txt (added)
• LayoutTests/fast/table/col-width-span-expand.html (added)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/rendering/RenderTable.cpp (modified) (2 diffs)
• WebCore/rendering/RenderTable.h (modified) (1 diff)
• WebCore/rendering/RenderTableCell.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2010-03-21  Dmitry Gorbik  <socket.h@gmail.com>
+
+        <http://webkit.org/b/14858> <col> width ignored when not tied to a single cell
+
+        Reviewed by David Kilzer.
+
+        Fixed width calculation for cells with span when <col> is defined.
+
+        * fast/table/col-width-span-expand-expected.txt: Added.
+        * fast/table/col-width-span-expand.html: Added.
+
 2010-03-20  Martin Robinson  <mrobinson@webkit.org>
 

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-03-21  Dmitry Gorbik  <socket.h@gmail.com>
+
+        <http://webkit.org/b/14858> <col> width ignored when not tied to a single cell
+
+        Reviewed by David Kilzer.
+
+        Fixed width calculation for cells with span when <col> is defined.
+
+        Test: fast/table/col-width-span-expand.html
+
+        * rendering/RenderTableCell.cpp:
+        (WebCore::RenderTableCell::styleOrColWidth): Added the calculation of cell width
+        in case of <col> defined and span > 1.
+
 2010-03-20  Antonio Gomes  <tonikitoo@webkit.org>
 

trunk/WebCore/rendering/RenderTable.cpp

@@ -582 +582 @@
 }
 
+RenderTableCol* RenderTable::nextColElement(RenderTableCol* current) const
+{
+    RenderObject* next = current->firstChild();
+    if (!next)
+        next = current->nextSibling();
+    if (!next && current->parent()->isTableCol())
+        next = current->parent()->nextSibling();
+
+    while (next) {
+        if (next->isTableCol())
+            return toRenderTableCol(next);
+        if (next != m_caption)
+            return 0;
+        next = next->nextSibling();
+    }
+    
+    return 0;
+}
+
 RenderTableCol* RenderTable::colElement(int col, bool* startEdge, bool* endEdge) const
 {
@@ -590 +609 @@
 
     while (child) {
-        if (child->isTableCol()) {
-            RenderTableCol* colElem = toRenderTableCol(child);
-            int span = colElem->span();
-            if (!colElem->firstChild()) {
-                int startCol = cCol;
-                int endCol = cCol + span - 1;
-                cCol += span;
-                if (cCol > col) {
-                    if (startEdge)
-                        *startEdge = startCol == col;
-                    if (endEdge)
-                        *endEdge = endCol == col;
-                    return colElem;
-                }
+        if (child->isTableCol())
+            break;
+        if (child != m_caption)
+            return 0;
+        child = child->nextSibling();
+    }
+    if (!child)
+        return 0;
+
+    RenderTableCol* colElem = toRenderTableCol(child);
+    while (colElem) {
+        int span = colElem->span();
+        if (!colElem->firstChild()) {
+            int startCol = cCol;
+            int endCol = cCol + span - 1;
+            cCol += span;
+            if (cCol > col) {
+                if (startEdge)
+                    *startEdge = startCol == col;
+                if (endEdge)
+                    *endEdge = endCol == col;
+                return colElem;
             }
-
-            RenderObject* next = child->firstChild();
-            if (!next)
-                next = child->nextSibling();
-            if (!next && child->parent()->isTableCol())
-                next = child->parent()->nextSibling();
-            child = next;
-        } else if (child == m_caption)
-            child = child->nextSibling();
-        else
-            break;
+        }
+        colElem = nextColElement(colElem);
     }
 

trunk/WebCore/rendering/RenderTable.h

@@ -114 +114 @@
 
     RenderTableCol* colElement(int col, bool* startEdge = 0, bool* endEdge = 0) const;
+    RenderTableCol* nextColElement(RenderTableCol* current) const;
 
     bool needsSectionRecalc() const { return m_needsSectionRecalc; }

trunk/WebCore/rendering/RenderTableCell.cpp

@@ -84 +84 @@
 {
     Length w = style()->width();
-    if (colSpan() > 1 || !w.isAuto())
+    if (!w.isAuto())
         return w;
+
     RenderTableCol* tableCol = table()->colElement(col());
+
     if (tableCol) {
-        w = tableCol->style()->width();
-        
+        int colSpanCount = colSpan();
+
+        Length colWidthSum = Length(0, Fixed);
+        for (int i = 1; i <= colSpanCount; i++) {
+            Length colWidth = tableCol->style()->width();
+
+            // Percentage value should be returned only for colSpan == 1.
+            // Otherwise we return original width for the cell.
+            if (!colWidth.isFixed()) {
+                if (colSpanCount > 1)
+                    return w;
+                return colWidth;
+            }
+
+            colWidthSum = Length(colWidthSum.value() + colWidth.value(), Fixed);
+
+            tableCol = table()->nextColElement(tableCol);
+            // If no next <col> tag found for the span we just return what we have for now.
+            if (!tableCol)
+                break;
+        }
+
         // 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);
-    }
+        if (colWidthSum.isFixed() && colWidthSum.value() > 0)
+            colWidthSum = Length(max(0, colWidthSum.value() - borderLeft() - borderRight() - paddingLeft() - paddingRight()), Fixed);
+        return colWidthSum;
+    }
+
     return w;
 }