Chromium Code Reviews

Unified Diff: Source/WebCore/rendering/RenderTable.cpp

Issue 12316027: Revert 130774 (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1410/
Patch Set: Created 7 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View side-by-side diff with in-line comments
« no previous file with comments | « LayoutTests/fast/table/css-table-max-width-expected.txt ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/WebCore/rendering/RenderTable.cpp
===================================================================
--- Source/WebCore/rendering/RenderTable.cpp (revision 143531)
+++ Source/WebCore/rendering/RenderTable.cpp (working copy)
@@ -273,20 +273,10 @@
// Ensure we aren't smaller than our min preferred width.
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.isNegative()) {
- LayoutUnit computedMinLogicalWidth = convertStyleLogicalWidthToComputedWidth(styleMinLogicalWidth, availableLogicalWidth);
- setLogicalWidth(max<int>(logicalWidth(), computedMinLogicalWidth));
- }
+ if (styleMinLogicalWidth.isSpecified() && styleMinLogicalWidth.isPositive())
+ setLogicalWidth(max<int>(logicalWidth(), convertStyleLogicalWidthToComputedWidth(styleMinLogicalWidth, availableLogicalWidth)));
// Finally, with our true width determined, compute our margins for real.
setMarginStart(0);
« no previous file with comments | « LayoutTests/fast/table/css-table-max-width-expected.txt ('k') | no next file » | no next file with comments »

Powered by Google App Engine