From 54cdeeebc7adcbcd900e8b6a141a8cae27d9a631 Mon Sep 17 00:00:00 2001 From: Steve Block Date: Fri, 10 Jun 2011 16:52:27 +0100 Subject: Merge WebKit at branches/chromium/742 r88085: Initial merge by git. Change-Id: I0501b484b9528e31b0026e5ad64416dd6541cdde --- Source/WebCore/rendering/AutoTableLayout.cpp | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'Source/WebCore/rendering/AutoTableLayout.cpp') diff --git a/Source/WebCore/rendering/AutoTableLayout.cpp b/Source/WebCore/rendering/AutoTableLayout.cpp index 4eef95f..f5311c2 100644 --- a/Source/WebCore/rendering/AutoTableLayout.cpp +++ b/Source/WebCore/rendering/AutoTableLayout.cpp @@ -265,11 +265,10 @@ void AutoTableLayout::computePreferredLogicalWidths(int& minWidth, int& maxWidth if (tableLogicalWidth.isFixed() && tableLogicalWidth.value() > 0) { minWidth = max(minWidth, tableLogicalWidth.value()); maxWidth = minWidth; - } - - // if there was no remaining percent, maxWidth is invalid. - if (!remainingPercent && maxNonPercent) + } else if (!remainingPercent && maxNonPercent) { + // if there was no remaining percent, maxWidth is invalid. maxWidth = intMaxForLength; + } } /* -- cgit v1.1