369243 - Remove unused flag NS_BLOCK_SHRINK_WRAP

Status: RESOLVED FIXED

(Core :: Layout, defect)

Description

[Simon Montagu :smontagu]

NS_BLOCK_SHRINK_WRAP is set in a few places, but never used.

Comment 1

[Simon Montagu :smontagu]

Attachment: Patch

Comment 2

[Boris Zbarsky [:bzbarsky]]

Comment on attachment 253926 [details] [diff] [review]
Patch

>Index: layout/base/nsCSSFrameConstructor.cpp
>   nsIFrame* areaFrame = NS_NewAreaFrame(mPresShell, styleContext,
>-    NS_BLOCK_SPACE_MGR | NS_BLOCK_SHRINK_WRAP);
>+    NS_BLOCK_SPACE_MGR);

This doesn't fit on one line in 80 chars?  Of so, indent the NS_BLOCK_SPACE_MGR like mPresShell?

>Index: layout/generic/nsHTMLParts.h
>-#define NS_BLOCK_SHRINK_WRAP                0x00100000
> #define NS_BLOCK_NO_AUTO_MARGINS            0x00200000

You're planning to reuse this flag, so no need to renumber, right?

>-#define NS_BLOCK_FLAGS_MASK                 0xF0F00000
>+#define NS_BLOCK_FLAGS_MASK                 0xF0E00000

I don't think we want that change...

I'd like dbaron to OK this.

Comment 3

[Simon Montagu :smontagu]

(In reply to comment #2)

> This doesn't fit on one line in 80 chars?  

Nope (85). 

> Of so, indent the NS_BLOCK_SPACE_MGR
> like mPresShell?

Done, here and throughout the file.

> You're planning to reuse this flag, so no need to renumber, right?

Right.

Comment 4

[Simon Montagu :smontagu]

Comment on attachment 253926 [details] [diff] [review]
Patch

>Index: layout/generic/nsHTMLParts.h

> /**
>  * Additional frame-state bits used by nsBlockFrame
>  * See the meanings at http://www.mozilla.org/newlayout/doc/block-and-line.html
>  */

This reference was already rather stale before this patch. Is there something more up-to-date that we can substitute?

Comment 5

[David Baron :dbaron: (⌚️UTC-4, no longer working on Mozilla)]

Comment on attachment 253926 [details] [diff] [review]
Patch

Oops.  sr=dbaron

Comment 6

[Simon Montagu :smontagu]

Checked in.