| Index: Source/core/layout/line/LineWidth.cpp
|
| diff --git a/Source/core/layout/line/LineWidth.cpp b/Source/core/layout/line/LineWidth.cpp
|
| index 9ca13dc6ce21a079eef9a71e5cf1118731522f10..46fbf926b53cfef97eb6671f56ef34502025fcd6 100644
|
| --- a/Source/core/layout/line/LineWidth.cpp
|
| +++ b/Source/core/layout/line/LineWidth.cpp
|
| @@ -60,19 +60,19 @@ void LineWidth::updateAvailableWidth(LayoutUnit replacedHeight)
|
| computeAvailableWidthFromLeftAndRight();
|
| }
|
|
|
| -void LineWidth::shrinkAvailableWidthForNewFloatIfNeeded(FloatingObject* newFloat)
|
| +void LineWidth::shrinkAvailableWidthForNewFloatIfNeeded(const FloatingObject& newFloat)
|
| {
|
| LayoutUnit height = m_block.logicalHeight();
|
| if (height < m_block.logicalTopForFloat(newFloat) || height >= m_block.logicalBottomForFloat(newFloat))
|
| return;
|
|
|
| ShapeOutsideDeltas shapeDeltas;
|
| - if (ShapeOutsideInfo* shapeOutsideInfo = newFloat->layoutObject()->shapeOutsideInfo()) {
|
| + if (ShapeOutsideInfo* shapeOutsideInfo = newFloat.layoutObject()->shapeOutsideInfo()) {
|
| LayoutUnit lineHeight = m_block.lineHeight(m_isFirstLine, m_block.isHorizontalWritingMode() ? HorizontalLine : VerticalLine, PositionOfInteriorLineBoxes);
|
| - shapeDeltas = shapeOutsideInfo->computeDeltasForContainingBlockLine(m_block, *newFloat, m_block.logicalHeight(), lineHeight);
|
| + shapeDeltas = shapeOutsideInfo->computeDeltasForContainingBlockLine(m_block, newFloat, m_block.logicalHeight(), lineHeight);
|
| }
|
|
|
| - if (newFloat->type() == FloatingObject::FloatLeft) {
|
| + if (newFloat.type() == FloatingObject::FloatLeft) {
|
| float newLeft = m_block.logicalRightForFloat(newFloat).toFloat();
|
| if (shapeDeltas.isValid()) {
|
| if (shapeDeltas.lineOverlapsShape())
|
|
|