diff options
author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-06-12 05:43:14 +0000 |
---|---|---|
committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-06-12 05:43:14 +0000 |
commit | 8dd16259287f58f9273002717ec4d27e97127719 (patch) | |
tree | 3863e62a53829a84037444beab3abd4ed9dfc7d0 /layout/generic/nsBlockFrame.cpp | |
parent | Releasing progress-linux version 126.0.1-1~progress7.99u1. (diff) | |
download | firefox-8dd16259287f58f9273002717ec4d27e97127719.tar.xz firefox-8dd16259287f58f9273002717ec4d27e97127719.zip |
Merging upstream version 127.0.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'layout/generic/nsBlockFrame.cpp')
-rw-r--r-- | layout/generic/nsBlockFrame.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/layout/generic/nsBlockFrame.cpp b/layout/generic/nsBlockFrame.cpp index 4582c29e0b..4b314bfcaf 100644 --- a/layout/generic/nsBlockFrame.cpp +++ b/layout/generic/nsBlockFrame.cpp @@ -1186,7 +1186,8 @@ static bool IsLineClampRoot(const nsBlockFrame* aFrame) { return false; } - if (StaticPrefs::layout_css_webkit_line_clamp_block_enabled()) { + if (StaticPrefs::layout_css_webkit_line_clamp_block_enabled() || + aFrame->PresContext()->Document()->ChromeRulesEnabled()) { return true; } @@ -7979,7 +7980,7 @@ bool nsBlockFrame::MarkerIsEmpty() const { const nsStyleList* list = marker->StyleList(); return marker->StyleContent()->mContent.IsNone() || (list->mCounterStyle.IsNone() && list->mListStyleImage.IsNone() && - marker->StyleContent()->ContentCount() == 0); + marker->StyleContent()->NonAltContentItems().IsEmpty()); } void nsBlockFrame::ReflowOutsideMarker(nsIFrame* aMarkerFrame, |