diff options
| author | athenian200 <athenian200@outlook.com> | 2020-09-03 18:55:28 -0500 |
|---|---|---|
| committer | Moonchild <moonchild@palemoon.org> | 2020-09-08 11:02:57 +0000 |
| commit | abaea77ccbc3658186b2027d2721451e8acb34a3 (patch) | |
| tree | 912de33bf1a047262c074df22309bdb32ba005dc /layout/generic/nsBlockFrame.cpp | |
| parent | 4698b4b3cadd2547cf87a03daebaa23e3bd92cd5 (diff) | |
| download | UXP-abaea77ccbc3658186b2027d2721451e8acb34a3.tar UXP-abaea77ccbc3658186b2027d2721451e8acb34a3.tar.gz UXP-abaea77ccbc3658186b2027d2721451e8acb34a3.tar.lz UXP-abaea77ccbc3658186b2027d2721451e8acb34a3.tar.xz UXP-abaea77ccbc3658186b2027d2721451e8acb34a3.zip | |
Issue #1641 - Implement CSS flow-root keyword
This is just a clean port of 1322191 and follow-up 1325970. It really seems to add create a new way to access existing code relating to block formatting and floating elements rather than implementing new functionality, and it is mercifully straightforwards.
Diffstat (limited to 'layout/generic/nsBlockFrame.cpp')
| -rw-r--r-- | layout/generic/nsBlockFrame.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/layout/generic/nsBlockFrame.cpp b/layout/generic/nsBlockFrame.cpp index 57838207d..41437c8f8 100644 --- a/layout/generic/nsBlockFrame.cpp +++ b/layout/generic/nsBlockFrame.cpp @@ -305,7 +305,7 @@ NS_NewBlockFormattingContext(nsIPresShell* aPresShell, nsStyleContext* aStyleContext) { nsBlockFrame* blockFrame = NS_NewBlockFrame(aPresShell, aStyleContext); - blockFrame->AddStateBits(NS_BLOCK_FLOAT_MGR | NS_BLOCK_MARGIN_ROOT); + blockFrame->AddStateBits(NS_BLOCK_FORMATTING_CONTEXT_STATE_BITS); return blockFrame; } @@ -6896,10 +6896,11 @@ nsBlockFrame::Init(nsIContent* aContent, // (http://dev.w3.org/csswg/css-writing-modes/#block-flow) // If the box has contain: paint (or contain: strict), then it should also // establish a formatting context. - if ((GetParent() && StyleVisibility()->mWritingMode != + if (StyleDisplay()->mDisplay == mozilla::StyleDisplay::FlowRoot || + (GetParent() && StyleVisibility()->mWritingMode != GetParent()->StyleVisibility()->mWritingMode) || StyleDisplay()->IsContainPaint()) { - AddStateBits(NS_BLOCK_FLOAT_MGR | NS_BLOCK_MARGIN_ROOT); + AddStateBits(NS_BLOCK_FORMATTING_CONTEXT_STATE_BITS); } if ((GetStateBits() & |