diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-15 03:34:50 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-15 03:34:50 +0000 |
| commit | def92d1b8e9d373e2f6f27c366d578d97d8960c6 (patch) | |
| tree | 2ef34b9ad8bb9a9220e05d60352558b15f513894 /layout/style/nsStyleStruct.cpp | |
| parent | Adding debian version 125.0.3-1. (diff) | |
| download | firefox-def92d1b8e9d373e2f6f27c366d578d97d8960c6.tar.xz firefox-def92d1b8e9d373e2f6f27c366d578d97d8960c6.zip | |
Merging upstream version 126.0.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'layout/style/nsStyleStruct.cpp')
| -rw-r--r-- | layout/style/nsStyleStruct.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/layout/style/nsStyleStruct.cpp b/layout/style/nsStyleStruct.cpp index 39f5b1a760..e46566d471 100644 --- a/layout/style/nsStyleStruct.cpp +++ b/layout/style/nsStyleStruct.cpp @@ -3536,7 +3536,7 @@ static nscoord Resolve(const StyleContainIntrinsicSize& aSize, } MOZ_ASSERT(aSize.HasAuto()); if (const auto* element = Element::FromNodeOrNull(aFrame.GetContent())) { - Maybe<float> lastSize = aAxis == eLogicalAxisBlock + Maybe<float> lastSize = aAxis == LogicalAxis::Block ? element->GetLastRememberedBSize() : element->GetLastRememberedISize(); if (lastSize && aFrame.HidesContent()) { @@ -3556,7 +3556,7 @@ Maybe<nscoord> ContainSizeAxes::ContainIntrinsicBSize( } const StyleContainIntrinsicSize& bSize = aFrame.StylePosition()->ContainIntrinsicBSize(aFrame.GetWritingMode()); - return Some(Resolve(bSize, aNoneValue, aFrame, eLogicalAxisBlock)); + return Some(Resolve(bSize, aNoneValue, aFrame, LogicalAxis::Block)); } Maybe<nscoord> ContainSizeAxes::ContainIntrinsicISize( @@ -3566,7 +3566,7 @@ Maybe<nscoord> ContainSizeAxes::ContainIntrinsicISize( } const StyleContainIntrinsicSize& iSize = aFrame.StylePosition()->ContainIntrinsicISize(aFrame.GetWritingMode()); - return Some(Resolve(iSize, aNoneValue, aFrame, eLogicalAxisInline)); + return Some(Resolve(iSize, aNoneValue, aFrame, LogicalAxis::Inline)); } nsSize ContainSizeAxes::ContainSize(const nsSize& aUncontainedSize, |