Changeset 112752 in webkit

Timestamp:

Mar 30, 2012 5:13:20 PM (12 years ago)

Author:

eae@chromium.org

Message:

Fix usage of LayoutUnits in table code.
​https://bugs.webkit.org/show_bug.cgi?id=82765

Reviewed by Eric Seidel.

Clean up usage of ints and LayoutUnits in table code in preparation for
turning on subpixel layout.

No new tests, no change in functionality.

• rendering/AutoTableLayout.cpp:

(WebCore::AutoTableLayout::computePreferredLogicalWidths):
Cast maxWidth to int as all table layout is done on int bounds.

• rendering/RenderTable.cpp:

(WebCore::RenderTable::convertStyleLogicalWidthToComputedWidth):
Change borders to LayoutUnit as paddings can have subpixel precision.

• rendering/RenderTable.h:

(WebCore::RenderTable::getColumnPos):
(WebCore::RenderTable::columnPositions):
Change getColumnPos and columnPositions to ints as the values are always
on pixel bounds.

(WebCore::RenderTable::bordersPaddingAndSpacingInRowDirection):

• rendering/RenderTableCell.cpp:

(WebCore::RenderTableCell::styleOrColLogicalWidth):
Remove unnecessary cast.

(WebCore::RenderTableCell::clippedOverflowRectForRepaint):
Use LayoutPoint instead of left/top.

• rendering/RenderTableSection.cpp:

(WebCore::RenderTableSection::calcRowLogicalHeight):
(WebCore::RenderTableSection::layoutRows):

• rendering/RenderTableSection.h:

Change baseline and baselineDescent to int to avoid unnecessary type
conversion.

Location:

trunk/Source/WebCore

Files:

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

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-03-30  Emil A Eklund  <eae@chromium.org>
+
+        Fix usage of LayoutUnits in table code.
+        https://bugs.webkit.org/show_bug.cgi?id=82765
+
+        Reviewed by Eric Seidel.
+
+        Clean up usage of ints and LayoutUnits in table code in preparation for
+        turning on subpixel layout.
+
+        No new tests, no change in functionality.
+
+        * rendering/AutoTableLayout.cpp:
+        (WebCore::AutoTableLayout::computePreferredLogicalWidths):
+        Cast maxWidth to int as all table layout is done on int bounds.
+        
+        * rendering/RenderTable.cpp:
+        (WebCore::RenderTable::convertStyleLogicalWidthToComputedWidth):
+        Change borders to LayoutUnit as paddings can have subpixel precision.
+        
+        * rendering/RenderTable.h:
+        (WebCore::RenderTable::getColumnPos):
+        (WebCore::RenderTable::columnPositions):
+        Change getColumnPos and columnPositions to ints as the values are always
+        on pixel bounds.
+        
+        (WebCore::RenderTable::bordersPaddingAndSpacingInRowDirection):
+        * rendering/RenderTableCell.cpp:
+        (WebCore::RenderTableCell::styleOrColLogicalWidth):
+        Remove unnecessary cast.
+        
+        (WebCore::RenderTableCell::clippedOverflowRectForRepaint):
+        Use LayoutPoint instead of left/top.
+        
+        * rendering/RenderTableSection.cpp:
+        (WebCore::RenderTableSection::calcRowLogicalHeight):
+        (WebCore::RenderTableSection::layoutRows):
+        * rendering/RenderTableSection.h:
+        Change baseline and baselineDescent to int to avoid unnecessary type
+        conversion.
+
 2012-03-30  Joe Thomas  <joethomas@motorola.com>
 

trunk/Source/WebCore/rendering/AutoTableLayout.cpp

@@ -252 +252 @@
     if (scaleColumns) {
         maxNonPercent = maxNonPercent * 100 / max(remainingPercent, epsilon);
-        maxWidth = max(maxWidth, static_cast<int>(min(maxNonPercent, numeric_limits<LayoutUnit>::max() / 2.0f)));
-        maxWidth = max(maxWidth, static_cast<int>(min(maxPercent, numeric_limits<LayoutUnit>::max() / 2.0f)));
+        maxWidth = max<int>(maxWidth, static_cast<int>(min(maxNonPercent, numeric_limits<LayoutUnit>::max() / 2.0f)));
+        maxWidth = max<int>(maxWidth, static_cast<int>(min(maxPercent, numeric_limits<LayoutUnit>::max() / 2.0f)));
     }
 

trunk/Source/WebCore/rendering/RenderTable.cpp

@@ -272 +272 @@
 {
     // HTML tables' width styles already include borders and paddings, but CSS tables' width styles do not.
-    int borders = 0;
+    LayoutUnit borders = 0;
     bool isCSSTable = !node() || !node()->hasTagName(tableTag);
     if (isCSSTable && styleLogicalWidth.isFixed() && styleLogicalWidth.isPositive()) {
         recalcBordersInRowDirection();
-        borders = borderStart() + borderEnd() + (collapseBorders() ? 0 : paddingStart() + paddingEnd());
+        borders = borderStart() + borderEnd() + (collapseBorders() ? zeroLayoutUnit : paddingStart() + paddingEnd());
     }
     return minimumValueForLength(styleLogicalWidth, availableWidth, view()) + borders;

trunk/Source/WebCore/rendering/RenderTable.h

@@ -46 +46 @@
     virtual ~RenderTable();
 
-    LayoutUnit getColumnPos(unsigned col) const { return m_columnPos[col]; }
+    int getColumnPos(unsigned col) const { return m_columnPos[col]; }
 
     int hBorderSpacing() const { return m_hSpacing; }
@@ -137 +137 @@
 
     Vector<ColumnStruct>& columns() { return m_columns; }
-    Vector<LayoutUnit>& columnPositions() { return m_columnPos; }
+    Vector<int>& columnPositions() { return m_columnPos; }
     RenderTableSection* header() const { return m_head; }
     RenderTableSection* footer() const { return m_foot; }
@@ -173 +173 @@
     {
         return borderStart() + borderEnd() +
-               (collapseBorders() ? zeroLayoutUnit : (paddingStart() + paddingEnd() + (numEffCols() + 1) * hBorderSpacing()));
+               (collapseBorders() ? zeroLayoutUnit : (paddingStart() + paddingEnd() + static_cast<LayoutUnit>(numEffCols() + 1) * hBorderSpacing()));
     }
 
@@ -255 +255 @@
     void distributeExtraLogicalHeight(int extraLogicalHeight);
 
-    mutable Vector<LayoutUnit> m_columnPos;
+    mutable Vector<int> m_columnPos;
     mutable Vector<ColumnStruct> m_columns;
     mutable Vector<RenderTableCaption*> m_captions;

trunk/Source/WebCore/rendering/RenderTableCell.cpp

@@ -144 +144 @@
         // See Bugzilla bug 8126 for details.
         if (colWidthSum.isFixed() && colWidthSum.value() > 0)
-            colWidthSum = Length(max<LayoutUnit>(0, colWidthSum.value() - borderAndPaddingLogicalWidth()), Fixed);
+            colWidthSum = Length(max(0, colWidthSum.value() - borderAndPaddingLogicalWidth()), Fixed);
         return colWidthSum;
     }
@@ -297 +297 @@
         }
     }
-    left = max(left, -minXVisualOverflow());
-    top = max(top, -minYVisualOverflow());
-    LayoutRect r(-left, - top, left + max(width() + right, maxXVisualOverflow()), top + max(height() + bottom, maxYVisualOverflow()));
+    LayoutPoint location(max<LayoutUnit>(left, -minXVisualOverflow()), max<LayoutUnit>(top, -minYVisualOverflow()));
+    LayoutRect r(-location.x(), -location.y(), location.x() + max(width() + right, maxXVisualOverflow()), location.y() + max(height() + bottom, maxYVisualOverflow()));
 
     if (RenderView* v = view()) {

trunk/Source/WebCore/rendering/RenderTableSection.cpp

@@ -337 +337 @@
     for (unsigned r = 0; r < m_grid.size(); r++) {
         m_grid[r].baseline = 0;
-        LayoutUnit baselineDescent = 0;
+        int baselineDescent = 0;
 
         // Our base size is the biggest logical height from our cells' styles (excluding row spanning cells).
@@ -621 +621 @@
                 EVerticalAlign va = cell->style()->verticalAlign();
                 if (va == BASELINE || va == TEXT_BOTTOM || va == TEXT_TOP || va == SUPER || va == SUB) {
-                    LayoutUnit baseline = cell->cellBaselinePosition();
+                    int baseline = cell->cellBaselinePosition();
                     if (baseline > cell->borderBefore() + cell->paddingBefore())
                         m_grid[r].baseline = max(m_grid[r].baseline, baseline);

trunk/Source/WebCore/rendering/RenderTableSection.h

@@ -111 +111 @@
         Row row;
         RenderTableRow* rowRenderer;
-        LayoutUnit baseline;
+        int baseline;
         Length logicalHeight;
     };