837000 - Remove nsBlockReflowState.h's #include of nsBlockFrame.h

Status: RESOLVED FIXED

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

Description

[Daniel Holbert [:dholbert]]

Noticed that nsBlockReflowState.h has an essentially-unnecessary "#include nsBlockFrame.h". Filing this bug on removing it, and fixing the collateral damage.

Comment 1

[Daniel Holbert [:dholbert]]

Attachment: fix v1

Changes in this patch:
 a) Move nsBlockReflowState.cpp's #include of its own header to the top, to be sure its header compiles on its own.

 b) Move the nsBlockReflowState::AppendPushedFloat() implementation from the .h file into the .cpp file, since it uses |mBlock| and requires us to have #included nsBlockFrame.h. (Specifically, that code passes mBlock to a function that expects to receive a nsIFrame*, and we need to have seen nsBlockFrame.h in order to know that nsBlockFrame inherits from nsIFrame which makes that function-call legal.)

 c) Removes nsBlockReflowState.h's #include of nsBlockFrame.h (and replaces it with forward-declarations)

 d) Explicitly #include nsBlockFrame.h in nsTextFrameThebes.cpp (which previously got nsBlockFrame via its include of nsLineLayout.h, which includes nsBlockReflowState.h, which used to (but no longer) #includes nsBlockFrame.h

 e) While I'm touching nsTextFrameThebes.cpp, move its header (nsTextFrame.h) to the top

Comment 2

[Daniel Holbert [:dholbert]]

(c) is what this bug is primarily about; the rest are just fixes to make sure we compile.

Comment 3

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

Comment on attachment 708870 [details] [diff] [review]
fix v1

r=dbaron

Comment 4

[Daniel Holbert [:dholbert]]

https://hg.mozilla.org/integration/mozilla-inbound/rev/e9f2886c0179

Comment 5

[Ed Morley [:emorley]]

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