| Index: Source/core/rendering/RenderTable.cpp
|
| diff --git a/Source/core/rendering/RenderTable.cpp b/Source/core/rendering/RenderTable.cpp
|
| index a5a90e380223bfb62aa2484c3ef5cabc7342914f..8f134835bc182e4fca8b52f712aa278f65026dec 100644
|
| --- a/Source/core/rendering/RenderTable.cpp
|
| +++ b/Source/core/rendering/RenderTable.cpp
|
| @@ -353,12 +353,12 @@ void RenderTable::layoutCaption(RenderTableCaption* caption)
|
| if (caption->needsLayout()) {
|
| // The margins may not be available but ensure the caption is at least located beneath any previous sibling caption
|
| // so that it does not mistakenly think any floats in the previous caption intrude into it.
|
| - caption->setLogicalLocation(LayoutPoint(caption->marginStart(), collapsedMarginBeforeForChild(caption) + logicalHeight()));
|
| + caption->setLogicalLocation(LayoutPoint(caption->marginStart(), collapsedMarginBeforeForChild(*caption) + logicalHeight()));
|
| // If RenderTableCaption ever gets a layout() function, use it here.
|
| caption->layoutIfNeeded();
|
| }
|
| // Apply the margins to the location now that they are definitely available from layout
|
| - LayoutUnit captionLogicalTop = collapsedMarginBeforeForChild(caption) + logicalHeight();
|
| + LayoutUnit captionLogicalTop = collapsedMarginBeforeForChild(*caption) + logicalHeight();
|
| if (view()->layoutState()->isPaginated()) {
|
| captionLogicalTop += caption->paginationStrut();
|
| caption->setPaginationStrut(0);
|
| @@ -368,7 +368,7 @@ void RenderTable::layoutCaption(RenderTableCaption* caption)
|
| if (!selfNeedsLayout())
|
| caption->setMayNeedPaintInvalidation(true);
|
|
|
| - setLogicalHeight(logicalHeight() + caption->logicalHeight() + collapsedMarginBeforeForChild(caption) + collapsedMarginAfterForChild(caption));
|
| + setLogicalHeight(logicalHeight() + caption->logicalHeight() + collapsedMarginBeforeForChild(*caption) + collapsedMarginAfterForChild(*caption));
|
| }
|
|
|
| void RenderTable::distributeExtraLogicalHeight(int extraLogicalHeight)
|
|
|