diff options
| author | Steve Block <steveblock@google.com> | 2011-06-10 16:52:27 +0100 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2011-06-14 01:14:02 +0100 |
| commit | 54cdeeebc7adcbcd900e8b6a141a8cae27d9a631 (patch) | |
| tree | 845b0d338b204a48560eca3b51b34cf92ed96840 /Source/WebCore/rendering/AutoTableLayout.cpp | |
| parent | d2c5226a647dc21d0c15267e09a3d19cf3e0d593 (diff) | |
| download | external_webkit-54cdeeebc7adcbcd900e8b6a141a8cae27d9a631.zip external_webkit-54cdeeebc7adcbcd900e8b6a141a8cae27d9a631.tar.gz external_webkit-54cdeeebc7adcbcd900e8b6a141a8cae27d9a631.tar.bz2 | |
Merge WebKit at branches/chromium/742 r88085: Initial merge by git.
Change-Id: I0501b484b9528e31b0026e5ad64416dd6541cdde
Diffstat (limited to 'Source/WebCore/rendering/AutoTableLayout.cpp')
| -rw-r--r-- | Source/WebCore/rendering/AutoTableLayout.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
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; + } } /* |