774835 - Refactor ApplyMinMaxConstraints in nsBlockFrame

Status: RESOLVED FIXED

(Core :: Layout, defect)

Description

[Scott Johnson (:jwir3)]

ApplyMinMaxConstraints in nsBlockFrame applies computed min/max height and width. We want to do these together in only one place. Instead, we should refactor this to be two functions: ApplyMinMaxHeight and ApplyMinMaxWidth.

Comment 1

[fantasai]

Attachment: patch

Comment 2

[Robert O'Callahan (:roc) (email my personal email if necessary)]

Comment on attachment 643127 [details] [diff] [review]
patch

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

::: layout/generic/nsHTMLReflowState.h
@@ +418,4 @@
>     */
> +  nscoord ApplyMinMaxWidth(nscoord aWidth) const {
> +    if (NS_UNCONSTRAINEDSIZE != mComputedMaxWidth)
> +        aWidth = NS_MIN(aWidth, mComputedMaxWidth);

{}

@@ +426,5 @@
> +   * size computed so far.
> +   */
> +  nscoord ApplyMinMaxHeight(nscoord aHeight) const {
> +    if (NS_UNCONSTRAINEDSIZE != mComputedMaxHeight)
> +        aHeight = NS_MIN(aHeight, mComputedMaxHeight);

{}

Comment 3

[fantasai]

I left out the extra braces to keep it extra compact since it's inlined in the header. Are you sure you want them in?

Comment 4

[Robert O'Callahan (:roc) (email my personal email if necessary)]

Yes. Keeping it compact doesn't matter.

Comment 5

[fantasai]

Attachment: patch with review comments addressed

Comment 6

[Scott Johnson (:jwir3)]

fantasai, if you add a commit message to your patch, I'll check it in for you.

Comment 7

[Scott Johnson (:jwir3)]

Nevermind, I've added it and pushed to inbound:
https://hg.mozilla.org/integration/mozilla-inbound/rev/1e038e82f416

Comment 8

[Ed Morley [:emorley]]

https://hg.mozilla.org/mozilla-central/rev/1e038e82f416