Index: Source/core/rendering/RenderBlockFlow.cpp |
diff --git a/Source/core/rendering/RenderBlockFlow.cpp b/Source/core/rendering/RenderBlockFlow.cpp |
index 1e5e7fd046b940073b8555b2fc13061822a561cd..cc7a4bc04e152d55f9ecafd810a3e51bdc2cd3b0 100644 |
--- a/Source/core/rendering/RenderBlockFlow.cpp |
+++ b/Source/core/rendering/RenderBlockFlow.cpp |
@@ -612,7 +612,6 @@ void RenderBlockFlow::layoutBlockChild(RenderBox* child, MarginInfo& marginInfo, |
determineLogicalLeftPositionForChild(child, ApplyLayoutDelta); |
LayoutSize childOffset = child->location() - oldRect.location(); |
- relayoutShapeDescendantIfMoved(childRenderBlock, childOffset); |
// Update our height now that the child has been placed in the correct position. |
setLogicalHeight(logicalHeight() + logicalHeightForChild(child)); |
@@ -2139,28 +2138,7 @@ LayoutPoint RenderBlockFlow::computeLogicalLocationForFloat(const FloatingObject |
LayoutUnit logicalLeftOffset = logicalLeftOffsetForContent(); // Constant part of left offset. |
LayoutUnit logicalRightOffset; // Constant part of right offset. |
// FIXME Bug 102948: This only works for shape outside directly set on this block. |
Zoltan
2014/03/26 21:01:09
We can remove the FIXME.
|
- ShapeInsideInfo* shapeInsideInfo = this->layoutShapeInsideInfo(); |
- // FIXME: Implement behavior for right floats. |
- if (shapeInsideInfo) { |
- LayoutSize floatLogicalSize = logicalSizeForFloat(floatingObject); |
- // floatingObject's logicalSize doesn't contain the actual height at this point, so we need to calculate it |
- floatLogicalSize.setHeight(logicalHeightForChild(childBox) + marginBeforeForChild(childBox) + marginAfterForChild(childBox)); |
- |
- // FIXME: If the float doesn't fit in the shape we should push it under the content box |
- logicalTopOffset = shapeInsideInfo->computeFirstFitPositionForFloat(floatLogicalSize); |
- if (logicalHeight() > logicalTopOffset) |
- logicalTopOffset = logicalHeight(); |
- |
- SegmentList segments = shapeInsideInfo->computeSegmentsForLine(logicalTopOffset, floatLogicalSize.height()); |
- // FIXME: Add support for shapes with multiple segments. |
- if (segments.size() >= 1) { |
- // The segment offsets are relative to the content box. |
- logicalRightOffset = logicalLeftOffset + segments[0].logicalRight; |
- logicalLeftOffset += segments[0].logicalLeft; |
- } |
- } else { |
- logicalRightOffset = logicalRightOffsetForContent(); |
- } |
+ logicalRightOffset = logicalRightOffsetForContent(); |
LayoutUnit floatLogicalWidth = min(logicalWidthForFloat(floatingObject), logicalRightOffset - logicalLeftOffset); // The width we look for. |