| Index: Source/core/rendering/shapes/ShapeOutsideInfo.cpp
|
| diff --git a/Source/core/rendering/shapes/ShapeOutsideInfo.cpp b/Source/core/rendering/shapes/ShapeOutsideInfo.cpp
|
| index 22cd6a810c35eabf737d12985113877bcd7ab962..6131a56f9947f9a6511851b1643857ae076e365c 100644
|
| --- a/Source/core/rendering/shapes/ShapeOutsideInfo.cpp
|
| +++ b/Source/core/rendering/shapes/ShapeOutsideInfo.cpp
|
| @@ -280,12 +280,12 @@ ShapeOutsideDeltas ShapeOutsideInfo::computeDeltasForContainingBlockLine(const R
|
| {
|
| ASSERT(lineHeight >= 0);
|
|
|
| - LayoutUnit borderBoxTop = containingBlock.logicalTopForFloat(&floatingObject) + containingBlock.marginBeforeForChild(m_renderer);
|
| + LayoutUnit borderBoxTop = containingBlock.logicalTopForFloat(floatingObject) + containingBlock.marginBeforeForChild(m_renderer);
|
| LayoutUnit borderBoxLineTop = lineTop - borderBoxTop;
|
|
|
| if (isShapeDirty() || !m_shapeOutsideDeltas.isForLine(borderBoxLineTop, lineHeight)) {
|
| LayoutUnit referenceBoxLineTop = borderBoxLineTop - logicalTopOffset();
|
| - LayoutUnit floatMarginBoxWidth = containingBlock.logicalWidthForFloat(&floatingObject);
|
| + LayoutUnit floatMarginBoxWidth = containingBlock.logicalWidthForFloat(floatingObject);
|
|
|
| if (computedShape().lineOverlapsShapeMarginBounds(referenceBoxLineTop, lineHeight)) {
|
| LineSegment segment = computedShape().getExcludedInterval((borderBoxLineTop - logicalTopOffset()), std::min(lineHeight, shapeLogicalBottom() - borderBoxLineTop));
|
|
|