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/nsInlineFrame.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/nsInlineFrame.cpp')
-rw-r--r-- | layout/generic/nsInlineFrame.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/layout/generic/nsInlineFrame.cpp b/layout/generic/nsInlineFrame.cpp index b481c71827..44fce51931 100644 --- a/layout/generic/nsInlineFrame.cpp +++ b/layout/generic/nsInlineFrame.cpp @@ -797,7 +797,7 @@ LogicalSides nsInlineFrame::GetLogicalSkipSides() const { (prev && (prev->mRect.height || prev->mRect.width))) { // Prev continuation is not empty therefore we don't render our start // border edge. - skip |= eLogicalSideBitsIStart; + skip += LogicalSide::IStart; } else { // If the prev continuation is empty, then go ahead and let our start // edge border render. @@ -809,7 +809,7 @@ LogicalSides nsInlineFrame::GetLogicalSkipSides() const { (next && (next->mRect.height || next->mRect.width))) { // Next continuation is not empty therefore we don't render our end // border edge. - skip |= eLogicalSideBitsIEnd; + skip += LogicalSide::IEnd; } else { // If the next continuation is empty, then go ahead and let our end // edge border render. @@ -822,15 +822,15 @@ LogicalSides nsInlineFrame::GetLogicalSkipSides() const { // a split should skip the "start" side. But figuring out which part of // the split we are involves getting our first continuation, which might be // expensive. So don't bother if we already have the relevant bits set. - if (skip != LogicalSides(mWritingMode, eLogicalSideBitsIBoth)) { + if (skip != LogicalSides(mWritingMode, LogicalSides::IBoth)) { // We're missing one of the skip bits, so check whether we need to set it. // Only get the first continuation once, as an optimization. nsIFrame* firstContinuation = FirstContinuation(); if (firstContinuation->FrameIsNonLastInIBSplit()) { - skip |= eLogicalSideBitsIEnd; + skip += LogicalSide::IEnd; } if (firstContinuation->FrameIsNonFirstInIBSplit()) { - skip |= eLogicalSideBitsIStart; + skip += LogicalSide::IStart; } } } |