Changeset 140479 in webkit

Timestamp:

Jan 22, 2013 3:28:02 PM (11 years ago)

Author:

ojan@chromium.org

Message:

REGRESION(r130774): preferred width of tables does not take max-width into account
​https://bugs.webkit.org/show_bug.cgi?id=107576

Reviewed by Tony Chang.

Source/WebCore:

Constrain preferred widths by min/max the way we do in other
RenderBlock subclasses. Eventually, we'll shared the code with
RenderBlock, but this is an incremental step in that direction
that we can safely merge into release branches.

Test: fast/table/min-max-width-preferred-size.html

• rendering/RenderTable.cpp:

(WebCore::RenderTable::computePreferredLogicalWidths):

LayoutTests:

• fast/table/min-max-width-preferred-size-expected.txt: Added.
• fast/table/min-max-width-preferred-size.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/table/min-max-width-preferred-size-expected.txt (added)
• LayoutTests/fast/table/min-max-width-preferred-size.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/rendering/RenderTable.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2013-01-22  Ojan Vafai  <ojan@chromium.org>
+
+        REGRESION(r130774): preferred width of tables does not take max-width into account
+        https://bugs.webkit.org/show_bug.cgi?id=107576
+
+        Reviewed by Tony Chang.
+
+        * fast/table/min-max-width-preferred-size-expected.txt: Added.
+        * fast/table/min-max-width-preferred-size.html: Added.
+
 2013-01-22  Michael Saboff  <msaboff@apple.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-01-22  Ojan Vafai  <ojan@chromium.org>
+
+        REGRESION(r130774): preferred width of tables does not take max-width into account
+        https://bugs.webkit.org/show_bug.cgi?id=107576
+
+        Reviewed by Tony Chang.
+
+        Constrain preferred widths by min/max the way we do in other
+        RenderBlock subclasses. Eventually, we'll shared the code with
+        RenderBlock, but this is an incremental step in that direction
+        that we can safely merge into release branches.
+
+        Test: fast/table/min-max-width-preferred-size.html
+
+        * rendering/RenderTable.cpp:
+        (WebCore::RenderTable::computePreferredLogicalWidths):
+
 2013-01-22  Adam Barth  <abarth@webkit.org>
 

trunk/Source/WebCore/rendering/RenderTable.cpp

@@ -727 +727 @@
         m_minPreferredLogicalWidth = max(m_minPreferredLogicalWidth, m_captions[i]->minPreferredLogicalWidth());
 
+    RenderStyle* styleToUse = style();
+    // FIXME: This should probably be checking for isSpecified since you should be able to use percentage, calc or viewport relative values for min-width.
+    if (styleToUse->logicalMinWidth().isFixed() && styleToUse->logicalMinWidth().value() > 0) {
+        m_maxPreferredLogicalWidth = std::max(m_maxPreferredLogicalWidth, adjustContentBoxLogicalWidthForBoxSizing(styleToUse->logicalMinWidth().value()));
+        m_minPreferredLogicalWidth = std::max(m_minPreferredLogicalWidth, adjustContentBoxLogicalWidthForBoxSizing(styleToUse->logicalMinWidth().value()));
+    }
+
+    // FIXME: This should probably be checking for isSpecified since you should be able to use percentage, calc or viewport relative values for maxWidth.
+    if (styleToUse->logicalMaxWidth().isFixed()) {
+        m_maxPreferredLogicalWidth = std::min(m_maxPreferredLogicalWidth, adjustContentBoxLogicalWidthForBoxSizing(styleToUse->logicalMaxWidth().value()));
+        m_minPreferredLogicalWidth = std::min(m_minPreferredLogicalWidth, adjustContentBoxLogicalWidthForBoxSizing(styleToUse->logicalMaxWidth().value()));
+    }
+
+    // FIXME: We should be adding borderAndPaddingLogicalWidth here, but m_tableLayout->computePreferredLogicalWidths already does,
+    // so a bunch of tests break doing this naively.
     setPreferredLogicalWidthsDirty(false);
 }