1361668 - Correct nsDisplayColumnRules's bound

Status: RESOLVED FIXED

(Core :: Graphics: WebRender, enhancement)

Description

[Ethan Lin[:ethlin]]

Some xul tests[1] will fail after using background color layer. It seems like the visible region of the painted layer is wrong when we create background color layer.

[1] layout/reftests/w3c-css/received/css-multicol-1/multicol-rule-large-001.xht

Comment 1

[Ethan Lin[:ethlin]]

Oh...It's not xul reftest. Looks like the visible region of the painted layer will be wrong after enabling color layer.

Comment 2

[Ethan Lin[:ethlin]]

Looks like the bound[1] of nsDisplayColumnRule is different from it's painting area[2]. I will fix the bound.


[1] https://dxr.mozilla.org/mozilla-central/source/layout/generic/nsColumnSetFrame.cpp?q=nsDisplayColumnRule&redirect_type=direct#37

[2] https://dxr.mozilla.org/mozilla-central/source/layout/generic/nsColumnSetFrame.cpp?q=nsDisplayColumnRule&redirect_type=direct#225

Comment 3

[Ethan Lin[:ethlin]]

Attachment: Fix the bound of nsDisplayColumnRules

Comment 4

[Matt Woodrow (:mattwoodrow)]

Comment on attachment 8864766 [details] [diff] [review]
Fix the bound of nsDisplayColumnRules

Review of attachment 8864766 [details] [diff] [review]:
-----------------------------------------------------------------

::: layout/generic/nsColumnSetFrame.cpp
@@ +158,5 @@
> +  return nsRect(linePt, aRuleSize);
> +}
> +
> +nsRect
> +nsColumnSetFrame::CalculateBounds(const nsPoint& aPt)

This function is almost identical to CreateBorderRenders, except for a few different lines that run per-child.

Can you instead make an iterator function that computes the isVertical/isRTL/contentRect etc, and then executes a lambda for each child?

That way CalculateBounds could be something like

{
  nsRect combined;
  ForEachColumn((nsRect lineRect)[combined] { combined.Union(combined, lineRect) });
  return combined;
}

@@ +286,5 @@
>      } else {
>        nscoord edgeOfPrev = prevFrame->GetRect().XMost() + aPt.x;
>        nscoord edgeOfNext = nextFrame->GetRect().X() + aPt.x;
>        linePt = nsPoint((edgeOfPrev + edgeOfNext - ruleSize.width) / 2,
>                         contentRect.y);

This code is in GetLineRect, so should be removed from here, right?

Comment 5

[Ethan Lin[:ethlin]]

Attachment: Fix the bound of nsDisplayColumnRules

Okay, I create an iterator function 'ForEachColumn()' for CalculateBounds and CreateBorderRenderers. Not very sure if the naming is proper.

Comment 6

[Matt Woodrow (:mattwoodrow)]

Comment on attachment 8865296 [details] [diff] [review]
Fix the bound of nsDisplayColumnRules

Review of attachment 8865296 [details] [diff] [review]:
-----------------------------------------------------------------

::: layout/generic/nsColumnSetFrame.cpp
@@ +190,5 @@
> +  }
> +}
> +
> +nsRect
> +nsColumnSetFrame::CalculateBounds(const nsPoint& aPt)

aOffset?

@@ +250,5 @@
>      skipSides |= mozilla::eSideBitsRight;
>    }
>  
> +  ForEachColumn([presContext, aCtx, border, aDirtyRect,
> +                skipSides, this, &aBorderRenderers]

I think you could just use [&] to just default to capturing everything needed by reference rather than listing all the variables here.

Comment 7

[Ethan Lin[:ethlin]]

(In reply to Matt Woodrow (:mattwoodrow) from comment #6)
> Comment on attachment 8865296 [details] [diff] [review]
> Fix the bound of nsDisplayColumnRules
> 
> Review of attachment 8865296 [details] [diff] [review]:
> -----------------------------------------------------------------
> 
> ::: layout/generic/nsColumnSetFrame.cpp
> @@ +190,5 @@
> > +  }
> > +}
> > +
> > +nsRect
> > +nsColumnSetFrame::CalculateBounds(const nsPoint& aPt)
> 
> aOffset?

Okay.
> 
> @@ +250,5 @@
> >      skipSides |= mozilla::eSideBitsRight;
> >    }
> >  
> > +  ForEachColumn([presContext, aCtx, border, aDirtyRect,
> > +                skipSides, this, &aBorderRenderers]
> 
> I think you could just use [&] to just default to capturing everything
> needed by reference rather than listing all the variables here.

Okay, I will use [&].

Comment 8

[Pulsebot]

Pushed by [e-mail]:
https://hg.mozilla.org/projects/graphics/rev/f9fc89f8b6ff
Fix the bound of nsDisplayColumnRules. r=mattwoodrow

Comment 9

[Wes Kocher (:KWierso) (Not reading bugmail; email directly if needed)]

https://hg.mozilla.org/mozilla-central/rev/f9fc89f8b6ff