| Index: Source/core/rendering/RenderTable.cpp
|
| diff --git a/Source/core/rendering/RenderTable.cpp b/Source/core/rendering/RenderTable.cpp
|
| index b0b848b3cc352a1be11c825db1f17f2494879a2f..dfb0311df82ecb134b171ea58f3e34ebb7f8125f 100644
|
| --- a/Source/core/rendering/RenderTable.cpp
|
| +++ b/Source/core/rendering/RenderTable.cpp
|
| @@ -253,7 +253,6 @@ void RenderTable::updateLogicalWidth()
|
| }
|
|
|
| RenderBlock* cb = containingBlock();
|
| - RenderView* renderView = view();
|
|
|
| LayoutUnit availableLogicalWidth = containingBlockLogicalWidthForContent();
|
| bool hasPerpendicularContainingBlock = cb->style()->isHorizontalWritingMode() != style()->isHorizontalWritingMode();
|
| @@ -264,8 +263,8 @@ void RenderTable::updateLogicalWidth()
|
| setLogicalWidth(convertStyleLogicalWidthToComputedWidth(styleLogicalWidth, containerWidthInInlineDirection));
|
| else {
|
| // Subtract out any fixed margins from our available width for auto width tables.
|
| - LayoutUnit marginStart = minimumValueForLength(style()->marginStart(), availableLogicalWidth, renderView);
|
| - LayoutUnit marginEnd = minimumValueForLength(style()->marginEnd(), availableLogicalWidth, renderView);
|
| + LayoutUnit marginStart = minimumValueForLength(style()->marginStart(), availableLogicalWidth);
|
| + LayoutUnit marginEnd = minimumValueForLength(style()->marginEnd(), availableLogicalWidth);
|
| LayoutUnit marginTotal = marginStart + marginEnd;
|
|
|
| // Subtract out our margins to get the available content width.
|
| @@ -312,8 +311,8 @@ void RenderTable::updateLogicalWidth()
|
| setMarginStart(marginValues.m_start);
|
| setMarginEnd(marginValues.m_end);
|
| } else {
|
| - setMarginStart(minimumValueForLength(style()->marginStart(), availableLogicalWidth, renderView));
|
| - setMarginEnd(minimumValueForLength(style()->marginEnd(), availableLogicalWidth, renderView));
|
| + setMarginStart(minimumValueForLength(style()->marginStart(), availableLogicalWidth));
|
| + setMarginEnd(minimumValueForLength(style()->marginEnd(), availableLogicalWidth));
|
| }
|
|
|
| // We should NEVER shrink the table below the min-content logical width, or else the table can't accomodate
|
| @@ -335,7 +334,7 @@ LayoutUnit RenderTable::convertStyleLogicalWidthToComputedWidth(const Length& st
|
| if (isCSSTable && styleLogicalWidth.isSpecified() && styleLogicalWidth.isPositive() && style()->boxSizing() == CONTENT_BOX)
|
| borders = borderStart() + borderEnd() + (collapseBorders() ? LayoutUnit() : paddingStart() + paddingEnd());
|
|
|
| - return minimumValueForLength(styleLogicalWidth, availableWidth, view()) + borders;
|
| + return minimumValueForLength(styleLogicalWidth, availableWidth) + borders;
|
| }
|
|
|
| LayoutUnit RenderTable::convertStyleLogicalHeightToComputedHeight(const Length& styleLogicalHeight)
|
| @@ -354,8 +353,6 @@ LayoutUnit RenderTable::convertStyleLogicalHeightToComputedHeight(const Length&
|
| computedLogicalHeight = styleLogicalHeight.value() - borders;
|
| } else if (styleLogicalHeight.isPercent())
|
| computedLogicalHeight = computePercentageLogicalHeight(styleLogicalHeight);
|
| - else if (styleLogicalHeight.isViewportPercentage())
|
| - computedLogicalHeight = minimumValueForLength(styleLogicalHeight, 0, view());
|
| else if (styleLogicalHeight.isIntrinsic())
|
| computedLogicalHeight = computeIntrinsicLogicalContentHeightUsing(styleLogicalHeight, logicalHeight() - borderAndPadding, borderAndPadding);
|
| else
|
| @@ -773,13 +770,13 @@ void RenderTable::computePreferredLogicalWidths()
|
| m_minPreferredLogicalWidth = max(m_minPreferredLogicalWidth, m_captions[i]->minPreferredLogicalWidth());
|
|
|
| RenderStyle* styleToUse = style();
|
| - // FIXME: This should probably be checking for isSpecified since you should be able to use percentage, calc or viewport relative values for min-width.
|
| + // FIXME: This should probably be checking for isSpecified since you should be able to use percentage or calc values for min-width.
|
| if (styleToUse->logicalMinWidth().isFixed() && styleToUse->logicalMinWidth().value() > 0) {
|
| m_maxPreferredLogicalWidth = std::max(m_maxPreferredLogicalWidth, adjustContentBoxLogicalWidthForBoxSizing(styleToUse->logicalMinWidth().value()));
|
| m_minPreferredLogicalWidth = std::max(m_minPreferredLogicalWidth, adjustContentBoxLogicalWidthForBoxSizing(styleToUse->logicalMinWidth().value()));
|
| }
|
|
|
| - // FIXME: This should probably be checking for isSpecified since you should be able to use percentage, calc or viewport relative values for maxWidth.
|
| + // FIXME: This should probably be checking for isSpecified since you should be able to use percentage or calc values for maxWidth.
|
| if (styleToUse->logicalMaxWidth().isFixed()) {
|
| // We don't constrain m_minPreferredLogicalWidth as the table should be at least the size of its min-content, regardless of 'max-width'.
|
| m_maxPreferredLogicalWidth = std::min(m_maxPreferredLogicalWidth, adjustContentBoxLogicalWidthForBoxSizing(styleToUse->logicalMaxWidth().value()));
|
|
|