Changeset 140047 in webkit

Timestamp:

Jan 17, 2013 2:41:14 PM (11 years ago)

Author:

ojan@chromium.org

Message:

Table layout does not need to explicitly call computePreferredLogicalWidths
​https://bugs.webkit.org/show_bug.cgi?id=106931

Reviewed by Julien Chaffraix.

Code shouldn't need to explicitly call computePreferredLogicalWidths.
It should only get called as a by-product of calling minPreferredLogicalWidth
or maxPreferredLogicalWidth.

Instead, make it clear that the calling code is just trying to clear
preferred width dirty bits.

• rendering/AutoTableLayout.cpp:

(WebCore::AutoTableLayout::recalcColumn):
The computePreferredLogicalWidths call on the table cell is redundant
with the minPreferredLogicalWidth call on the next line.

• rendering/FixedTableLayout.cpp:

(WebCore::FixedTableLayout::calcWidthArray):
We only need to clear the dirty bit here. Table cells don't use
their preferred widths in fixed table layout calculations.

• rendering/RenderTableCell.h:
• rendering/RenderTableCol.cpp:

(WebCore::RenderTableCol::clearPreferredLogicalWidthsDirtyBits):

• rendering/RenderTableCol.h:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• rendering/AutoTableLayout.cpp (modified) (2 diffs)
• rendering/FixedTableLayout.cpp (modified) (3 diffs)
• rendering/RenderTableCell.h (modified) (2 diffs)
• rendering/RenderTableCol.cpp (modified) (1 diff)
• rendering/RenderTableCol.h (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-01-17  Ojan Vafai  <ojan@chromium.org>
+
+        Table layout does not need to explicitly call computePreferredLogicalWidths
+        https://bugs.webkit.org/show_bug.cgi?id=106931
+
+        Reviewed by Julien Chaffraix.
+
+        Code shouldn't need to explicitly call computePreferredLogicalWidths.
+        It should only get called as a by-product of calling minPreferredLogicalWidth
+        or maxPreferredLogicalWidth.
+
+        Instead, make it clear that the calling code is just trying to clear
+        preferred width dirty bits.
+
+        * rendering/AutoTableLayout.cpp:
+        (WebCore::AutoTableLayout::recalcColumn):
+        The computePreferredLogicalWidths call on the table cell is redundant
+        with the minPreferredLogicalWidth call on the next line.
+
+        * rendering/FixedTableLayout.cpp:
+        (WebCore::FixedTableLayout::calcWidthArray):
+        We only need to clear the dirty bit here. Table cells don't use
+        their preferred widths in fixed table layout calculations.
+
+        * rendering/RenderTableCell.h:
+        * rendering/RenderTableCol.cpp:
+        (WebCore::RenderTableCol::clearPreferredLogicalWidthsDirtyBits):
+        * rendering/RenderTableCol.h:
+
 2013-01-17  Julien Chaffraix  <jchaffraix@webkit.org>
 

trunk/Source/WebCore/rendering/AutoTableLayout.cpp

@@ -51 +51 @@
 
     for (RenderObject* child = m_table->children()->firstChild(); child; child = child->nextSibling()) {
-        if (child->isRenderTableCol())
-            toRenderTableCol(child)->computePreferredLogicalWidths();
-        else if (child->isTableSection()) {
+        if (child->isRenderTableCol()){
+            // RenderTableCols don't have the concept of preferred logical width, but we need to clear their dirty bits
+            // so that if we call setPreferredWidthsDirty(true) on a col or one of its descendants, we'll mark it's
+            // ancestors as dirty.
+            toRenderTableCol(child)->clearPreferredLogicalWidthsDirtyBits();
+        } else if (child->isTableSection()) {
             RenderTableSection* section = toRenderTableSection(child);
             unsigned numRows = section->numRows();
@@ -73 +76 @@
 
                 if (cell->colSpan() == 1) {
-                    if (cell->preferredLogicalWidthsDirty())
-                        cell->computePreferredLogicalWidths();
                     columnLayout.minLogicalWidth = max<int>(cell->minPreferredLogicalWidth(), columnLayout.minLogicalWidth);
                     if (cell->maxPreferredLogicalWidth() > columnLayout.maxLogicalWidth) {

trunk/Source/WebCore/rendering/FixedTableLayout.cpp

@@ -89 +89 @@
     unsigned currentEffectiveColumn = 0;
     for (RenderTableCol* col = m_table->firstColumn(); col; col = col->nextColumn()) {
-        col->computePreferredLogicalWidths();
+        // RenderTableCols don't have the concept of preferred logical width, but we need to clear their dirty bits
+        // so that if we call setPreferredWidthsDirty(true) on a col or one of its descendants, we'll mark it's
+        // ancestors as dirty.
+        col->clearPreferredLogicalWidthsDirtyBits();
 
         // Width specified by column-groups that have column child does not affect column width in fixed layout tables
@@ -139 +142 @@
 
         RenderTableCell* cell = toRenderTableCell(child);
-        if (cell->preferredLogicalWidthsDirty())
-            cell->computePreferredLogicalWidths();
 
         Length logicalWidth = cell->styleOrColLogicalWidth();
         unsigned span = cell->colSpan();
         int fixedBorderBoxLogicalWidth = 0;
+        // FIXME: Support other length types. If the width is non-auto, it should probably just use
+        // RenderBox::computeLogicalWidthInRegionUsing to compute the width.
         if (logicalWidth.isFixed() && logicalWidth.isPositive()) {
             fixedBorderBoxLogicalWidth = cell->adjustBorderBoxLogicalWidthForBoxSizing(logicalWidth.value());
@@ -162 +165 @@
             ++currentColumn;
         }
+
+        // FixedTableLayout doesn't use min/maxPreferredLogicalWidths, but we need to clear the
+        // dirty bit on the cell so that we'll correctly mark its ancestors dirty
+        // in case we later call setPreferredLogicalWidthsDirty(true) on it later.
+        if (cell->preferredLogicalWidthsDirty())
+            cell->setPreferredLogicalWidthsDirty(false);
     }
 

trunk/Source/WebCore/rendering/RenderTableCell.h

@@ -103 +103 @@
     }
 
-    virtual void computePreferredLogicalWidths();
 
     void setCellLogicalWidth(int constrainedLogicalWidth);
@@ -208 +207 @@
 protected:
     virtual void styleDidChange(StyleDifference, const RenderStyle* oldStyle);
+    virtual void computePreferredLogicalWidths();
 
 private:

trunk/Source/WebCore/rendering/RenderTableCol.cpp

@@ -116 +116 @@
 }
 
-void RenderTableCol::computePreferredLogicalWidths()
+void RenderTableCol::clearPreferredLogicalWidthsDirtyBits()
 {
     setPreferredLogicalWidthsDirty(false);

trunk/Source/WebCore/rendering/RenderTableCol.h

@@ -44 +44 @@
     RenderObjectChildList* children() { return &m_children; }
 
-    virtual void computePreferredLogicalWidths();
+    void clearPreferredLogicalWidthsDirtyBits();
 
     unsigned span() const { return m_span; }
@@ -86 +86 @@
     virtual bool isRenderTableCol() const OVERRIDE { return true; }
     virtual void updateFromElement();
+    virtual void computePreferredLogicalWidths() OVERRIDE { ASSERT_NOT_REACHED(); }
 
     virtual void insertedIntoTree() OVERRIDE;