diff options
author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-15 03:35:49 +0000 |
---|---|---|
committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-15 03:35:49 +0000 |
commit | d8bbc7858622b6d9c278469aab701ca0b609cddf (patch) | |
tree | eff41dc61d9f714852212739e6b3738b82a2af87 /layout/generic/MiddleCroppingBlockFrame.cpp | |
parent | Releasing progress-linux version 125.0.3-1~progress7.99u1. (diff) | |
download | firefox-d8bbc7858622b6d9c278469aab701ca0b609cddf.tar.xz firefox-d8bbc7858622b6d9c278469aab701ca0b609cddf.zip |
Merging upstream version 126.0.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'layout/generic/MiddleCroppingBlockFrame.cpp')
-rw-r--r-- | layout/generic/MiddleCroppingBlockFrame.cpp | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/layout/generic/MiddleCroppingBlockFrame.cpp b/layout/generic/MiddleCroppingBlockFrame.cpp index 4cbbb684aa..75dc205a4f 100644 --- a/layout/generic/MiddleCroppingBlockFrame.cpp +++ b/layout/generic/MiddleCroppingBlockFrame.cpp @@ -57,18 +57,11 @@ void MiddleCroppingBlockFrame::UpdateDisplayedValueToUncroppedValue( } nscoord MiddleCroppingBlockFrame::GetMinISize(gfxContext* aRenderingContext) { - nscoord result; - DISPLAY_MIN_INLINE_SIZE(this, result); - // Our min inline size is our pref inline size - result = GetPrefISize(aRenderingContext); - return result; + return GetPrefISize(aRenderingContext); } nscoord MiddleCroppingBlockFrame::GetPrefISize(gfxContext* aRenderingContext) { - nscoord result; - DISPLAY_PREF_INLINE_SIZE(this, result); - nsAutoString prevValue; bool restoreOldValue = false; @@ -79,7 +72,7 @@ nscoord MiddleCroppingBlockFrame::GetPrefISize(gfxContext* aRenderingContext) { UpdateDisplayedValueToUncroppedValue(false); } - result = nsBlockFrame::GetPrefISize(aRenderingContext); + nscoord result = nsBlockFrame::GetPrefISize(aRenderingContext); if (restoreOldValue) { UpdateDisplayedValue(prevValue, /* aIsCropped = */ true, false); |