Index: third_party/WebKit/Source/core/layout/TableLayoutAlgorithmFixed.cpp |
diff --git a/third_party/WebKit/Source/core/layout/TableLayoutAlgorithmFixed.cpp b/third_party/WebKit/Source/core/layout/TableLayoutAlgorithmFixed.cpp |
index 1278b03263c78c4d1016ebf3d124beaf1e5ceae0..9b741577f83baaed5b2a4b1fd2807b5361a86e83 100644 |
--- a/third_party/WebKit/Source/core/layout/TableLayoutAlgorithmFixed.cpp |
+++ b/third_party/WebKit/Source/core/layout/TableLayoutAlgorithmFixed.cpp |
@@ -184,7 +184,7 @@ void TableLayoutAlgorithmFixed::applyPreferredLogicalWidthQuirks(LayoutUnit& min |
{ |
Length tableLogicalWidth = m_table->style()->logicalWidth(); |
if (tableLogicalWidth.isFixed() && tableLogicalWidth.isPositive()) { |
- minWidth = maxWidth = max(minWidth, LayoutUnit(tableLogicalWidth.value() - m_table->bordersPaddingAndSpacingInRowDirection())).floor(); |
+ minWidth = maxWidth = LayoutUnit(max(minWidth, LayoutUnit(tableLogicalWidth.value() - m_table->bordersPaddingAndSpacingInRowDirection())).floor()); |
} |
/* |
@@ -200,7 +200,7 @@ void TableLayoutAlgorithmFixed::applyPreferredLogicalWidthQuirks(LayoutUnit& min |
// We can achieve this effect by making the maxwidth of fixed tables with percentage |
// widths be infinite. |
if (m_table->style()->logicalWidth().hasPercent() && maxWidth < tableMaxWidth) |
- maxWidth = tableMaxWidth; |
+ maxWidth = LayoutUnit(tableMaxWidth); |
} |
void TableLayoutAlgorithmFixed::layout() |