Changeset 130698 in webkit

Timestamp:

Oct 8, 2012 3:59:36 PM (12 years ago)

Author:

eric@webkit.org

Message:

Make no-column table-layout cases a little faster with inlining
​https://bugs.webkit.org/show_bug.cgi?id=98566

Reviewed by Julien Chaffraix.

This change is almost not worth it at only a couple percent boost on
​http://www.robohornet.org/tests/resizecol.html
However, I think the logicalWidthFromTableColumn split it kinda nice
so I've decided to post it anyway.

• rendering/RenderTable.cpp:

(WebCore::RenderTable::slowColElement):

• rendering/RenderTable.h:

(WebCore::RenderTable::colElement):
(RenderTable):

• rendering/RenderTableCell.cpp:

(WebCore::RenderTableCell::logicalWidthFromTableColumn):

• rendering/RenderTableCell.h:

(WebCore::RenderTableCell::styleOrColLogicalWidth):
(RenderTableCell):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• rendering/RenderTable.cpp (modified) (1 diff)
• rendering/RenderTable.h (modified) (2 diffs)
• rendering/RenderTableCell.cpp (modified) (1 diff)
• rendering/RenderTableCell.h (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-10-08  Eric Seidel  <eric@webkit.org>
+
+        Make no-column table-layout cases a little faster with inlining
+        https://bugs.webkit.org/show_bug.cgi?id=98566
+
+        Reviewed by Julien Chaffraix.
+
+        This change is almost not worth it at only a couple percent boost on
+        http://www.robohornet.org/tests/resizecol.html
+        However, I think the logicalWidthFromTableColumn split it kinda nice
+        so I've decided to post it anyway.
+
+        * rendering/RenderTable.cpp:
+        (WebCore::RenderTable::slowColElement):
+        * rendering/RenderTable.h:
+        (WebCore::RenderTable::colElement):
+        (RenderTable):
+        * rendering/RenderTableCell.cpp:
+        (WebCore::RenderTableCell::logicalWidthFromTableColumn):
+        * rendering/RenderTableCell.h:
+        (WebCore::RenderTableCell::styleOrColLogicalWidth):
+        (RenderTableCell):
+
 2012-10-08  Arpita Bahuguna  <arpitabahuguna@gmail.com>
 

trunk/Source/WebCore/rendering/RenderTable.cpp

@@ -755 +755 @@
 }
 
-RenderTableCol* RenderTable::colElement(unsigned col, bool* startEdge, bool* endEdge) const
-{
-    if (!m_hasColElements)
-        return 0;
+RenderTableCol* RenderTable::slowColElement(unsigned col, bool* startEdge, bool* endEdge) const
+{
+    ASSERT(m_hasColElements);
 
     unsigned columnCount = 0;

trunk/Source/WebCore/rendering/RenderTable.h

@@ -199 +199 @@
     RenderTableCol* firstColumn() const;
 
-    RenderTableCol* colElement(unsigned col, bool* startEdge = 0, bool* endEdge = 0) const;
+    RenderTableCol* colElement(unsigned col, bool* startEdge = 0, bool* endEdge = 0) const
+    {
+        // The common case is to not have columns, make that case fast.
+        if (!m_hasColElements)
+            return 0;
+        return slowColElement(col, startEdge, endEdge);
+    }
 
     bool needsSectionRecalc() const { return m_needsSectionRecalc; }
@@ -267 +273 @@
     virtual LayoutUnit firstLineBoxBaseline() const OVERRIDE;
     virtual LayoutUnit lastLineBoxBaseline() const OVERRIDE;
+
+    RenderTableCol* slowColElement(unsigned col, bool* startEdge, bool* endEdge) const;
 
     virtual RenderBlock* firstLineBlock() const;

trunk/Source/WebCore/rendering/RenderTableCell.cpp

@@ -145 +145 @@
 }
 
-Length RenderTableCell::styleOrColLogicalWidth() const
-{
-    Length w = style()->logicalWidth();
-    if (!w.isAuto())
-        return w;
-
-    if (RenderTableCol* tableCol = table()->colElement(col())) {
-        unsigned colSpanCount = colSpan();
-
-        Length colWidthSum = Length(0, Fixed);
-        for (unsigned i = 1; i <= colSpanCount; i++) {
-            Length colWidth = tableCol->style()->logicalWidth();
-
-            // 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 = tableCol->nextColumn();
-            // 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 (colWidthSum.isFixed() && colWidthSum.value() > 0)
-            colWidthSum = Length(max(0.0f, colWidthSum.value() - borderAndPaddingLogicalWidth()), Fixed);
-        return colWidthSum;
-    }
-
-    return w;
+Length RenderTableCell::logicalWidthFromColumns(RenderTableCol* firstColForThisCell, Length widthFromStyle) const
+{
+    ASSERT(firstColForThisCell && firstColForThisCell == table()->colElement(col()));
+    RenderTableCol* tableCol = firstColForThisCell;
+
+    unsigned colSpanCount = colSpan();
+    int colWidthSum = 0;
+    for (unsigned i = 1; i <= colSpanCount; i++) {
+        Length colWidth = tableCol->style()->logicalWidth();
+
+        // Percentage value should be returned only for colSpan == 1.
+        // Otherwise we return original width for the cell.
+        if (!colWidth.isFixed()) {
+            if (colSpanCount > 1)
+                return widthFromStyle;
+            return colWidth;
+        }
+
+        colWidthSum += colWidth.value();
+        tableCol = tableCol->nextColumn();
+        // 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, see bug 8126.
+    // FIXME: Why is border/padding ignored in the negative width case?
+    if (colWidthSum > 0)
+        return Length(max(0, colWidthSum - borderAndPaddingLogicalWidth().ceil()), Fixed);
+    return Length(colWidthSum, Fixed);
 }
 

trunk/Source/WebCore/rendering/RenderTableCell.h

@@ -81 +81 @@
     }
 
-    Length styleOrColLogicalWidth() const;
+    Length styleOrColLogicalWidth() const
+    {
+        Length styleWidth = style()->logicalWidth();
+        if (!styleWidth.isAuto())
+            return styleWidth;
+        if (RenderTableCol* firstColumn = table()->colElement(col()))
+            return logicalWidthFromColumns(firstColumn, styleWidth);
+        return styleWidth;
+    }
 
     LayoutUnit logicalHeightForRowSizing() const;
@@ -238 +246 @@
     CollapsedBorderValue computeCollapsedAfterBorder(IncludeBorderColorOrNot = IncludeBorderColor) const;
 
+    Length logicalWidthFromColumns(RenderTableCol* firstColForThisCell, Length widthFromStyle) const;
+
     void updateColAndRowSpanFlags();