| Index: Source/core/rendering/RenderTable.cpp
|
| diff --git a/Source/core/rendering/RenderTable.cpp b/Source/core/rendering/RenderTable.cpp
|
| index 973d32e0b4a62815cabfb40cfff43efc55893554..45a77f5625b711e1c244c43a5619a01a5e76d2b6 100644
|
| --- a/Source/core/rendering/RenderTable.cpp
|
| +++ b/Source/core/rendering/RenderTable.cpp
|
| @@ -274,10 +274,8 @@ void RenderTable::updateLogicalWidth()
|
|
|
| // Subtract out our margins to get the available content width.
|
| LayoutUnit availableContentLogicalWidth = max<LayoutUnit>(0, containerWidthInInlineDirection - marginTotal);
|
| - if (shrinkToAvoidFloats() && cb->containsFloats() && !hasPerpendicularContainingBlock) {
|
| - // FIXME: Work with regions someday.
|
| - availableContentLogicalWidth = shrinkLogicalWidthToAvoidFloats(marginStart, marginEnd, toRenderBlockFlow(cb), 0);
|
| - }
|
| + if (shrinkToAvoidFloats() && cb->containsFloats() && !hasPerpendicularContainingBlock)
|
| + availableContentLogicalWidth = shrinkLogicalWidthToAvoidFloats(marginStart, marginEnd, toRenderBlockFlow(cb));
|
|
|
| // Ensure we aren't bigger than our available width.
|
| setLogicalWidth(min<int>(availableContentLogicalWidth, maxPreferredLogicalWidth()));
|
| @@ -307,7 +305,7 @@ void RenderTable::updateLogicalWidth()
|
| if (!hasPerpendicularContainingBlock) {
|
| LayoutUnit containerLogicalWidthForAutoMargins = availableLogicalWidth;
|
| if (avoidsFloats() && cb->containsFloats())
|
| - containerLogicalWidthForAutoMargins = containingBlockAvailableLineWidthInRegion(0); // FIXME: Work with regions someday.
|
| + containerLogicalWidthForAutoMargins = containingBlockAvailableLineWidth();
|
| ComputedMarginValues marginValues;
|
| bool hasInvertedDirection = cb->style()->isLeftToRightDirection() == style()->isLeftToRightDirection();
|
| computeInlineDirectionMargins(cb, containerLogicalWidthForAutoMargins, logicalWidth(),
|
| @@ -1378,9 +1376,9 @@ int RenderTable::firstLineBoxBaseline() const
|
| return -1;
|
| }
|
|
|
| -LayoutRect RenderTable::overflowClipRect(const LayoutPoint& location, RenderRegion* region, OverlayScrollbarSizeRelevancy relevancy)
|
| +LayoutRect RenderTable::overflowClipRect(const LayoutPoint& location, OverlayScrollbarSizeRelevancy relevancy)
|
| {
|
| - LayoutRect rect = RenderBlock::overflowClipRect(location, region, relevancy);
|
| + LayoutRect rect = RenderBlock::overflowClipRect(location, relevancy);
|
|
|
| // If we have a caption, expand the clip to include the caption.
|
| // FIXME: Technically this is wrong, but it's virtually impossible to fix this
|
| @@ -1406,7 +1404,7 @@ bool RenderTable::nodeAtPoint(const HitTestRequest& request, HitTestResult& resu
|
| LayoutPoint adjustedLocation = accumulatedOffset + location();
|
|
|
| // Check kids first.
|
| - if (!hasOverflowClip() || locationInContainer.intersects(overflowClipRect(adjustedLocation, locationInContainer.region()))) {
|
| + if (!hasOverflowClip() || locationInContainer.intersects(overflowClipRect(adjustedLocation))) {
|
| for (RenderObject* child = lastChild(); child; child = child->previousSibling()) {
|
| if (child->isBox() && !toRenderBox(child)->hasSelfPaintingLayer() && (child->isTableSection() || child->isTableCaption())) {
|
| LayoutPoint childPoint = flipForWritingModeForChild(toRenderBox(child), adjustedLocation);
|
|
|