815972 - Remove unneeded nsDisplayListCollection from nsBlockFrame.cpp:DisplayLine()

Status: RESOLVED FIXED

(Core :: Layout, defect)

Description

[Daniel Holbert [:dholbert] (vacation until Jun 23)]

As hinted by the "then again" in bug 808767 comment 5, we have a nsDisplayListCollection in nsBlockFrame.cpp's "DisplayLine" helper-method that we don't actually need.

Filing this bug on removing it.

Comment 1

[Daniel Holbert [:dholbert] (vacation until Jun 23)]

Attachment: fix

This patch:
 (a) removes collection & directly operates on aLists instead.

 (b) scopes |nsresult rv| to inside the loop.

 (c) pulls the "lineInline ? nsIFrame::DISPLAY_CHILD_INLINE : 0" conditional out of the loop, since it will always evaluate to the same thing, and it makes the BuildDisplayListForChild function-call a little less bulky.

Try run w/ Linux32 & Mac: https://tbpl.mozilla.org/?tree=Try&rev=97c11cee34d2

Comment 2

[Daniel Holbert [:dholbert] (vacation until Jun 23)]

(The try run doesn't include parts (b) or (c), but those parts have basically zero chance of affecting behavior.)

Comment 3

[Daniel Holbert [:dholbert] (vacation until Jun 23)]

https://hg.mozilla.org/integration/mozilla-inbound/rev/8ecf5ea9461d

Comment 4

[Ed Morley [:emorley]]

https://hg.mozilla.org/mozilla-central/rev/8ecf5ea9461d