Changeset 143683 in webkit

Timestamp:

Feb 21, 2013, 7:12:04 PM (12 years ago)

Author:

ojan@chromium.org

Message:

Clean up computePreferredLogicalWidths functions in TableLayout subclasses
​https://bugs.webkit.org/show_bug.cgi?id=110515

Reviewed by Tony Chang.

No change in behavior. This is just a cleanup in preparation for other
refactoring to this code.

• rendering/FixedTableLayout.cpp:

(WebCore::FixedTableLayout::calcWidthArray):
Move a FIXME here from computePreferredLogicalWidths. It makes more sense here.
(WebCore::FixedTableLayout::computePreferredLogicalWidths):
-Remove outdated or unhelpful comments.
-Isolate the fixed width codepath to make it a bit less convoluted.
(WebCore::FixedTableLayout::layout):

• rendering/FixedTableLayout.h:

The argument to calcWidthArray is never used. Remove it.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• rendering/FixedTableLayout.cpp (modified) (3 diffs)
• rendering/FixedTableLayout.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-02-21  Ojan Vafai  <ojan@chromium.org>
+
+        Clean up computePreferredLogicalWidths functions in TableLayout subclasses
+        https://bugs.webkit.org/show_bug.cgi?id=110515
+
+        Reviewed by Tony Chang.
+
+        No change in behavior. This is just a cleanup in preparation for other
+        refactoring to this code.
+
+        * rendering/FixedTableLayout.cpp:
+        (WebCore::FixedTableLayout::calcWidthArray):
+        Move a FIXME here from computePreferredLogicalWidths. It makes more sense here.
+        (WebCore::FixedTableLayout::computePreferredLogicalWidths):
+        -Remove outdated or unhelpful comments.
+        -Isolate the fixed width codepath to make it a bit less convoluted.
+        (WebCore::FixedTableLayout::layout):
+        * rendering/FixedTableLayout.h:
+        The argument to calcWidthArray is never used. Remove it.
+
 2013-02-21  Eric Seidel  <eric@webkit.org>
 

trunk/Source/WebCore/rendering/FixedTableLayout.cpp

@@ -78 +78 @@
 }
 
-int FixedTableLayout::calcWidthArray(int)
+int FixedTableLayout::calcWidthArray()
 {
+    // FIXME: We might want to wait until we have all of the first row before computing for the first time.
     int usedWidth = 0;
 
@@ -178 +179 @@
 void FixedTableLayout::computePreferredLogicalWidths(LayoutUnit& minWidth, LayoutUnit& maxWidth)
 {
-    // FIXME: This entire calculation is incorrect for both minwidth and maxwidth.
-    
-    // we might want to wait until we have all of the first row before
-    // layouting for the first time.
-
-    // only need to calculate the minimum width as the sum of the
-    // cols/cells with a fixed width.
-    //
-    // The maximum width is max(minWidth, tableWidth).
     int bordersPaddingAndSpacing = m_table->bordersPaddingAndSpacingInRowDirection();
-
-    int tableLogicalWidth = m_table->style()->logicalWidth().isFixed() ? m_table->style()->logicalWidth().value() - bordersPaddingAndSpacing : 0;
-    int mw = calcWidthArray(tableLogicalWidth) + bordersPaddingAndSpacing;
-
-    minWidth = max(mw, tableLogicalWidth);
-    maxWidth = minWidth;
-
-    // This quirk is very similar to one that exists in RenderBlock::calcBlockPrefWidths().
-    // Here's the example for this one:
+    minWidth = maxWidth = calcWidthArray() + bordersPaddingAndSpacing;
+
+    Length tableLogicalWidth = m_table->style()->logicalWidth();
+    if (tableLogicalWidth.isFixed() && tableLogicalWidth.isPositive())
+        minWidth = maxWidth = max<int>(minWidth, tableLogicalWidth.value() - bordersPaddingAndSpacing);
+
     /*
         <table style="width:100%; background-color:red"><tr><td>
@@ -221 +210 @@
     // This means that our preferred logical widths were not recomputed as expected.
     if (nEffCols != m_width.size()) {
-        calcWidthArray(tableLogicalWidth);
+        calcWidthArray();
         // FIXME: Table layout shouldn't modify our table structure (but does due to columns and column-groups).
         nEffCols = m_table->numEffCols();

trunk/Source/WebCore/rendering/FixedTableLayout.h

@@ -39 +39 @@
 
 private:
-    int calcWidthArray(int tableWidth);
+    int calcWidthArray();
 
     Vector<Length> m_width;