Changeset 156846 in webkit for trunk/Source/WebCore/rendering/RenderBlockLineLayout.cpp

Timestamp:

Oct 3, 2013, 11:24:59 AM (12 years ago)

Author:

[email protected]

Message:

[CSS Shapes] Support block content with inline content around floats in shape-inside
​https://bugs.webkit.org/show_bug.cgi?id=121616

Reviewed by David Hyatt.

In r156022 and r156364, I added support for floats inside shape-inside with inline content. This change extends
the existing implementation to support block content with inline content (paragraphs). I added an extra text for
positioning a float inside shape-inside without text content around it.

Source/WebCore:

Tests: fast/shapes/shape-inside/shape-inside-left-float-in-lower-left-triangle-block-content.html

fast/shapes/shape-inside/shape-inside-left-float-in-lower-right-triangle-block-content.html
fast/shapes/shape-inside/shape-inside-left-float-in-lower-right-triangle.html
fast/shapes/shape-inside/shape-inside-left-float-in-upper-left-triangle-block-content.html
fast/shapes/shape-inside/shape-inside-left-float-in-upper-right-triangle-block-content.html

• rendering/FloatingObjects.h:

(WebCore::FloatingObject::logicalSize): Add new function to return the FloatingObject logical size.

• rendering/LineWidth.cpp:

(WebCore::LineWidth::fitBelowFloats): When the lineBreaker code pushes down the content below the floating object,
we need to update the segments if we are in a shape-inside.

• rendering/RenderBlock.cpp:

(WebCore::RenderBlock::computeLogicalLocationForFloat): Do the positioning based on the float actual size, and use the
recent shapeInsideInfo. (Calling layoutShapeInsideInfo which deals with the layoutStates also instead of shapeInsideInfo.)

• rendering/RenderBlock.h:
• rendering/RenderBlockLineLayout.cpp:

(WebCore::RenderBlock::adjustLogicalLineTopAndLogicalHeightIfNeeded): If we don't have inline content we still need to positionize
our float content in a shape-inside.
(WebCore::updateSegmentsForShapes): Use the right coordinates for block content with inline content.

LayoutTests:

• fast/shapes/shape-inside/shape-inside-left-float-in-lower-left-triangle-block-content-expected.html: Added.
• fast/shapes/shape-inside/shape-inside-left-float-in-lower-left-triangle-block-content.html: Added.
• fast/shapes/shape-inside/shape-inside-left-float-in-lower-right-triangle-block-content-expected.html: Added.
• fast/shapes/shape-inside/shape-inside-left-float-in-lower-right-triangle-block-content.html: Added.
• fast/shapes/shape-inside/shape-inside-left-float-in-lower-right-triangle-expected.html: Added.
• fast/shapes/shape-inside/shape-inside-left-float-in-lower-right-triangle.html: Added.
• fast/shapes/shape-inside/shape-inside-left-float-in-upper-left-triangle-block-content-expected.html: Added.
• fast/shapes/shape-inside/shape-inside-left-float-in-upper-left-triangle-block-content.html: Added.
• fast/shapes/shape-inside/shape-inside-left-float-in-upper-right-triangle-block-content-expected.html: Added.
• fast/shapes/shape-inside/shape-inside-left-float-in-upper-right-triangle-block-content.html: Added.

File:

• trunk/Source/WebCore/rendering/RenderBlockLineLayout.cpp (modified) (3 diffs)

trunk/Source/WebCore/rendering/RenderBlockLineLayout.cpp

@@ -1479 +1479 @@
 {
     LayoutUnit adjustedLogicalLineTop = adjustLogicalLineTop(shapeInsideInfo, resolver.position(), end, wordMeasurements);
+
+    if (shapeInsideInfo && !wordMeasurements.size() && containsFloats()) {
+        lastFloatFromPreviousLine = m_floatingObjects->set().last().get();
+        LayoutUnit floatLogicalTopOffset = shapeInsideInfo->computeFirstFitPositionForFloat(lastFloatFromPreviousLine->logicalSize(isHorizontalWritingMode()));
+        if (logicalHeight() < floatLogicalTopOffset)
+            adjustedLogicalLineTop = floatLogicalTopOffset;
+    }
+
     if (!adjustedLogicalLineTop)
         return false;
@@ -2650 +2658 @@
 
     ShapeInsideInfo* shapeInsideInfo = block->layoutShapeInsideInfo();
-    if (!shapeInsideInfo)
+    if (!lastFloatFromPreviousLine->isPlaced() || !shapeInsideInfo)
         return;
 
     bool isHorizontalWritingMode = block->isHorizontalWritingMode();
-
-    LayoutUnit lineLogicalTop = block->logicalHeight();
+    LayoutUnit logicalOffsetFromShapeContainer = block->logicalOffsetFromShapeAncestorContainer(shapeInsideInfo->owner()).height();
+
+    LayoutUnit lineLogicalTop = block->logicalHeight() + logicalOffsetFromShapeContainer;
     LayoutUnit lineLogicalHeight = block->lineHeight(isFirstLine, isHorizontalWritingMode ? HorizontalLine : VerticalLine, PositionOfInteriorLineBoxes);
     LayoutUnit lineLogicalBottom = lineLogicalTop + lineLogicalHeight;
@@ -2675 +2684 @@
     if (block->logicalHeight() < floatLogicalTop) {
         shapeInsideInfo->adjustLogicalLineTop(minSegmentWidth + floatLogicalWidth);
-        block->setLogicalHeight(shapeInsideInfo->logicalLineTop());
-    }
-
-    shapeInsideInfo->updateSegmentsForLine(block->logicalHeight(), lineLogicalHeight);
+        block->setLogicalHeight(shapeInsideInfo->logicalLineTop() - logicalOffsetFromShapeContainer);
+    }
+
+    lineLogicalTop = block->logicalHeight() + logicalOffsetFromShapeContainer;
+
+    shapeInsideInfo->updateSegmentsForLine(lineLogicalTop, lineLogicalHeight);
     width.updateCurrentShapeSegment();
     width.updateAvailableWidth();