Changeset 130774 in webkit

Timestamp:

Oct 9, 2012 9:55:46 AM (12 years ago)

Author:

commit-queue@webkit.org

Message:

max-width property is does not overriding the width properties for css tables(display:table)
​https://bugs.webkit.org/show_bug.cgi?id=98455

Patch by Pravin D <​pravind.2k4@gmail.com> on 2012-10-09
Reviewed by Tony Chang.

Source/WebCore:

The max-width property determines the maximum computed width an element can have. In case of css tables(display:table),
the computed was not being limited by the max-width property. The current patch fixes this issue.

Test: fast/table/css-table-max-width.html

• rendering/RenderTable.cpp:

(WebCore::RenderTable::updateLogicalWidth):

Logic to compute the logical width of an element such that it does not exceed the max-width value.
Also when both min-width and max-width are present, the following contraint is used to compute the logical width:

1) min-width < Computed LogicalWidth < max-width, when min-width < max-width.
2) Computed LogicalWidth = min-width, when min-width > max-width.

LayoutTests:

• fast/table/css-table-max-width-expected.txt: Added.
• fast/table/css-table-max-width.html: Added.

Location:

trunk

Files:

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

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2012-10-09  Pravin D  <pravind.2k4@gmail.com>
+
+        max-width property is does not overriding the width properties for css tables(display:table)
+        https://bugs.webkit.org/show_bug.cgi?id=98455
+
+        Reviewed by Tony Chang.
+
+        * fast/table/css-table-max-width-expected.txt: Added.
+        * fast/table/css-table-max-width.html: Added.
+
 2012-10-09  Zan Dobersek  <zandobersek@gmail.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-10-09  Pravin D  <pravind.2k4@gmail.com>
+
+        max-width property is does not overriding the width properties for css tables(display:table)
+        https://bugs.webkit.org/show_bug.cgi?id=98455
+
+        Reviewed by Tony Chang.
+
+        The max-width property determines the maximum computed width an element can have. In case of css tables(display:table),
+        the computed was not being limited by the max-width property. The current patch fixes this issue.
+
+        Test: fast/table/css-table-max-width.html
+
+        * rendering/RenderTable.cpp:
+        (WebCore::RenderTable::updateLogicalWidth):
+         Logic to compute the logical width of an element such that it does not exceed the max-width value.
+         Also when both min-width and max-width are present, the following contraint is used to compute the logical width:
+           1) min-width < Computed LogicalWidth < max-width, when min-width < max-width.
+           2) Computed LogicalWidth = min-width, when min-width > max-width.
+
 2012-10-09  Harald Alvestrand  <hta@google.com>
 

trunk/Source/WebCore/rendering/RenderTable.cpp

@@ -256 +256 @@
     setLogicalWidth(max<int>(logicalWidth(), minPreferredLogicalWidth()));
 
+    
+    // Ensure we aren't bigger than our max-width style.
+    Length styleMaxLogicalWidth = style()->logicalMaxWidth();
+    if (styleMaxLogicalWidth.isSpecified() && !styleMaxLogicalWidth.isNegative()) {
+        LayoutUnit computedMaxLogicalWidth = convertStyleLogicalWidthToComputedWidth(styleMaxLogicalWidth, availableLogicalWidth);
+        setLogicalWidth(min<int>(logicalWidth(), computedMaxLogicalWidth));
+    }
+
     // Ensure we aren't smaller than our min-width style.
     Length styleMinLogicalWidth = style()->logicalMinWidth();
-    if (styleMinLogicalWidth.isSpecified() && styleMinLogicalWidth.isPositive())
-        setLogicalWidth(max<int>(logicalWidth(), convertStyleLogicalWidthToComputedWidth(styleMinLogicalWidth, availableLogicalWidth)));
+    if (styleMinLogicalWidth.isSpecified() && !styleMinLogicalWidth.isNegative()) {
+        LayoutUnit computedMinLogicalWidth = convertStyleLogicalWidthToComputedWidth(styleMinLogicalWidth, availableLogicalWidth);
+        setLogicalWidth(max<int>(logicalWidth(), computedMinLogicalWidth));
+    }
 
     // Finally, with our true width determined, compute our margins for real.