843332 - Simplify nsBlockFrame::PullFrame/PullFrameFrom

Status: RESOLVED FIXED

(Core :: Layout: Block and Inline, defect)

Comment 1

[Mats Palmgren (inactive)]

Attachment: Call DrainSelfOverflowList() if mLines is empty

Make PullFrame drain the overflow list before calling PullFrameFrom that can then be simplified to only deal with mList/mFrames.

Comment 2

[Mats Palmgren (inactive)]

Attachment: Remove the use of aState in PullFrameFrom and add some assertions

Comment 3

[Mats Palmgren (inactive)]

Attachment: Pass 'false' to ReparentFloats since we only added one frame

... 'true' also works because when pulling a frame from a next-in-flow
the frame is appended and thus has no next-siblings, but I feel that
'false' is more correct here.

https://tbpl.mozilla.org/?tree=Try&rev=e6b7441af95b

Comment 4

[Boris Zbarsky [:bzbarsky]]

Comment on attachment 717486 [details] [diff] [review]
Call DrainSelfOverflowList() if mLines is empty

>-    NS_ASSERTION(frame->GetParent() == aFromContainer, "unexpected parent frame");

Why remove that?

r=me

Comment 5

[Boris Zbarsky [:bzbarsky]]

Comment on attachment 717487 [details] [diff] [review]
Remove the use of aState in PullFrameFrom and add some assertions

r=me; I guess this was working around the fact that appends on frame lists used to be slow?

Comment 6

[Boris Zbarsky [:bzbarsky]]

Comment on attachment 717488 [details] [diff] [review]
Pass 'false' to ReparentFloats since we only added one frame

Worth adding a comment about why the last arg is false.  r=me

Comment 7

[Mats Palmgren (inactive)]

(In reply to Boris Zbarsky (:bz) from comment #4)
> >-    NS_ASSERTION(frame->GetParent() == aFromContainer, "unexpected parent frame");
> 
> Why remove that?

The ReparentFrame() call on the next line asserts that.

(In reply to Boris Zbarsky (:bz) from comment #6)
> Worth adding a comment about why the last arg is false.  r=me

done

https://hg.mozilla.org/integration/mozilla-inbound/rev/8e7d5e9ee70a
https://hg.mozilla.org/integration/mozilla-inbound/rev/df02eb97f4d1
https://hg.mozilla.org/integration/mozilla-inbound/rev/78b5b032d676

Comment 8

[Gregory Szorc [:gps]]

https://hg.mozilla.org/mozilla-central/rev/8e7d5e9ee70a
https://hg.mozilla.org/mozilla-central/rev/df02eb97f4d1
https://hg.mozilla.org/mozilla-central/rev/78b5b032d676