| Index: Source/core/layout/shapes/ShapeOutsideInfo.cpp
|
| diff --git a/Source/core/layout/shapes/ShapeOutsideInfo.cpp b/Source/core/layout/shapes/ShapeOutsideInfo.cpp
|
| index 8e2f81d369b722b9b5020478835df591fe79ed71..0261f845d5b9d75b869b9d8198bcdf1b8071e5f2 100644
|
| --- a/Source/core/layout/shapes/ShapeOutsideInfo.cpp
|
| +++ b/Source/core/layout/shapes/ShapeOutsideInfo.cpp
|
| @@ -282,12 +282,12 @@ ShapeOutsideDeltas ShapeOutsideInfo::computeDeltasForContainingBlockLine(const L
|
| {
|
| 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));
|
|
|