diff options
| author | Moonchild <moonchild@palemoon.org> | 2020-09-23 23:45:46 +0000 |
|---|---|---|
| committer | Moonchild <moonchild@palemoon.org> | 2020-09-23 23:45:46 +0000 |
| commit | 9f5c27ba479c54d4ebb1bd59b61fbf793f6df93f (patch) | |
| tree | 831e0ae1649d6135429def03688bc93ff7c86b03 /layout/generic/nsHTMLParts.h | |
| parent | 42f895f27f239e973c9c06241f7a58da7381353c (diff) | |
| parent | f624bd1375655dea196cdcb70a9860bc5817df49 (diff) | |
| download | UXP-9f5c27ba479c54d4ebb1bd59b61fbf793f6df93f.tar UXP-9f5c27ba479c54d4ebb1bd59b61fbf793f6df93f.tar.gz UXP-9f5c27ba479c54d4ebb1bd59b61fbf793f6df93f.tar.lz UXP-9f5c27ba479c54d4ebb1bd59b61fbf793f6df93f.tar.xz UXP-9f5c27ba479c54d4ebb1bd59b61fbf793f6df93f.zip | |
Merge branch 'redwood' into releaseRELBASE_20200929RC_20200924
Diffstat (limited to 'layout/generic/nsHTMLParts.h')
| -rw-r--r-- | layout/generic/nsHTMLParts.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/layout/generic/nsHTMLParts.h b/layout/generic/nsHTMLParts.h index 89a7a6edd..b11d49e08 100644 --- a/layout/generic/nsHTMLParts.h +++ b/layout/generic/nsHTMLParts.h @@ -27,8 +27,7 @@ class nsTableColFrame; // These are all the block specific frame bits, they are copied from // the prev-in-flow to a newly created next-in-flow, except for the // NS_BLOCK_FLAGS_NON_INHERITED_MASK bits below. -#define NS_BLOCK_FLAGS_MASK (NS_BLOCK_MARGIN_ROOT | \ - NS_BLOCK_FLOAT_MGR | \ +#define NS_BLOCK_FLAGS_MASK (NS_BLOCK_FORMATTING_CONTEXT_STATE_BITS | \ NS_BLOCK_CLIP_PAGINATED_OVERFLOW | \ NS_BLOCK_HAS_FIRST_LETTER_STYLE | \ NS_BLOCK_FRAME_HAS_OUTSIDE_BULLET | \ |