Bug 115456 – [CSS Regions][CSS Exclusions] Shape-inside on regions should respect region borders and paddings

• Status: RESOLVED
• Resolution: FIXED
• Component: CSS

[Zoltan Horvath]

I started to work on bug #115001, but shape-inside on regions doesn't respect the region's borders well. In order to fix bug #115001 first we need to fix the border handling, so I've made a separate patch to fix the border issue on shape-inside on regions, in this patch I moved the renderflowthread (http://trac.webkit.org/browser/trunk/Source/WebCore/rendering/ExclusionShapeInfo.cpp?rev=149226#L62) logic from ShapeInsideInfo to RenderBlockLineLayout.cpp and added several test cases for shape-inside on regions.

[Zoltan Horvath]

Created attachment 200950 [details]
proposed patch

[Dave Hyatt]

Comment on attachment 200950 [details]
proposed patch

View in context: https://bugs.webkit.org/attachment.cgi?id=200950&action=review

Would be nice as this code grows to get it out of layoutRunsAndFloatsInRange and into helpers.

> Source/WebCore/rendering/RenderBlockLineLayout.cpp:1716
>  #if ENABLE(CSS_EXCLUSIONS)
> -        // FIXME: Bug 95361: It is possible for a line to grow beyond lineHeight, in which
> -        // case these segments may be incorrect.
> -        if (layoutState.flowThread())
> +        RenderRegion* currentRegion = regionAtBlockOffset(logicalHeight());
> +        if (currentRegion)
>              exclusionShapeInsideInfo = layoutExclusionShapeInsideInfo();
>          if (exclusionShapeInsideInfo) {
>              LayoutUnit lineTop = logicalHeight() + absoluteLogicalTop;
> -            exclusionShapeInsideInfo->computeSegmentsForLine(lineTop, lineHeight(layoutState.lineInfo().isFirstLine(), isHorizontalWritingMode() ? HorizontalLine : VerticalLine, PositionOfInteriorLineBoxes));
> +            LayoutUnit lineHeight = this->lineHeight(layoutState.lineInfo().isFirstLine(), isHorizontalWritingMode() ? HorizontalLine : VerticalLine, PositionOfInteriorLineBoxes);
> +
> +            if (layoutState.flowThread()) {
> +                RenderRegion* nextRegion = regionAtBlockOffset(logicalHeight() + lineHeight - LayoutUnit(1));
> +                lineTop += exclusionShapeInsideInfo->owner()->borderAndPaddingBefore();
> +                // Content in a flow thread is relative to the beginning of the thread, but the shape calculation should be relative to the current region.
> +                if (currentRegion == nextRegion)
> +                    lineTop -= currentRegion->logicalTopForFlowThreadContent();
> +            }
> +
> +            // FIXME: Bug 95361: It is possible for a line to grow beyond lineHeight, in which case these segments may be incorrect.
> +            exclusionShapeInsideInfo->computeSegmentsForLine(lineTop, lineHeight);

Can we get this shifted into a helper function? It seems sizable enough that getting it out of layoutRunsAndFloatsInRange and into a helper would be nice.

> Source/WebCore/rendering/RenderBlockLineLayout.cpp:1746
>  #if ENABLE(CSS_EXCLUSIONS)
>          if (LayoutUnit adjustedLogicalLineTop = adjustLogicalLineTop(exclusionShapeInsideInfo, resolver.position(), end, wordMeasurements)) {
> -            end = restartLayoutRunsAndFloatsInRange(logicalHeight(), adjustedLogicalLineTop - absoluteLogicalTop, lastFloatFromPreviousLine, resolver, oldEnd);
> +            LayoutUnit newLogicalHeight = adjustedLogicalLineTop - absoluteLogicalTop;
> +            if (layoutState.flowThread())
> +                newLogicalHeight -= currentRegion->logicalTopForFlowThreadContent();
> +            end = restartLayoutRunsAndFloatsInRange(logicalHeight(), newLogicalHeight, lastFloatFromPreviousLine, resolver, oldEnd);
>              continue;
>          }
>  #endif

Seems like this could be shifted into a helper too... maybe combined with or rolled into adjustLogicalLineTop.

if (helperFunction()) continue;

[Zoltan Horvath]

Created attachment 201421 [details]
proposed patch


> (From update of attachment 200950 [details])
> View in context: https://bugs.webkit.org/attachment.cgi?id=200950&action=review
> 
> Would be nice as this code grows to get it out of layoutRunsAndFloatsInRange and into helpers.

Done.
 
> Seems like this could be shifted into a helper too... maybe combined with or rolled into adjustLogicalLineTop.

I've added a separate one. If you wish we can combine with adjustLogicalLineTop later.

[Dave Hyatt]

Comment on attachment 201421 [details]
proposed patch

r=me

[WebKit Commit Bot]

The commit-queue encountered the following flaky tests while processing attachment 201421 [details]:

platform/mac/fonts/han-disunification.html bug 114207 (author: [e-mail])
platform/mac/editing/deleting/deletionUI-single-instance.html bug 114181 (author: [e-mail])
transitions/color-transition-rounding.html bug 114182 (author: [e-mail])
transitions/cubic-bezier-overflow-svg-length.html bug 114183 (author: [e-mail])
transitions/interrupt-zero-duration.html bug 114184 (authors: [e-mail], [e-mail], and [e-mail])
transitions/multiple-background-transitions.html bug 114185 (author: [e-mail])
transitions/cubic-bezier-overflow-color.html bug 114186 (author: [e-mail])
transitions/mismatched-shadow-transitions.html bug 114188 (author: [e-mail])
transitions/color-transition-all.html bug 114189 (authors: [e-mail] and [e-mail])
transitions/cubic-bezier-overflow-shadow.html bug 114191 (author: [e-mail])
transitions/min-max-width-height-transitions.html bug 114192 (author: [e-mail])
transitions/cancel-transition.html bug 114193 (authors: [e-mail], [e-mail], and [e-mail])
transitions/border-radius-transition.html bug 114194 (author: [e-mail])
transitions/flex-transitions.html bug 114195 (author: [e-mail])
transitions/mixed-type.html bug 114196 (author: [e-mail])
transitions/multiple-mask-transitions.html bug 114197 (author: [e-mail])
transitions/color-transition-premultiplied.html bug 114198 (author: [e-mail])
transitions/mismatched-shadow-styles.html bug 114199 (author: [e-mail])
transitions/mask-transitions.html bug 114200 (authors: [e-mail], [e-mail], and [e-mail])
transitions/cubic-bezier-overflow-length.html bug 114201 (author: [e-mail])
transitions/multiple-background-size-transitions.html bug 114202 (authors: [e-mail] and [e-mail])
transitions/clip-transition.html bug 114203 (authors: [e-mail], [e-mail], and [e-mail])
transitions/cubic-bezier-overflow-transform.html bug 114204 (author: [e-mail])
transitions/interrupted-accelerated-transition.html bug 56242 (authors: [e-mail], [e-mail], and [e-mail])
transitions/background-transitions.html bug 114206 (author: [e-mail])
http/tests/security/cookies/third-party-cookie-blocking-user-action.html bug 114511 (authors: [e-mail], [e-mail], and [e-mail])
http/tests/security/mixedContent/redirect-https-to-http-iframe-in-main-frame.html bug 114208 (authors: [e-mail] and [e-mail])
fast/table/table-rowspan-height-distribution-in-rows.html bug 116053
fast/loader/javascript-url-in-object.html bug 114210 (authors: [e-mail] and [e-mail])
media/media-element-play-after-eos.html bug 115048 (authors: [e-mail] and [e-mail])
The commit-queue is continuing to process your patch.

[WebKit Commit Bot]

Comment on attachment 201421 [details]
proposed patch

Clearing flags on attachment: 201421

Committed r150027: <http://trac.webkit.org/changeset/150027>

[WebKit Commit Bot]

All reviewed patches have been landed.  Closing bug.