diff --git a/layout/generic/ScrollContainerFrame.cpp b/layout/generic/ScrollContainerFrame.cpp index d0ab722f4c38..1147acfdbafc 100644 --- a/layout/generic/ScrollContainerFrame.cpp +++ b/layout/generic/ScrollContainerFrame.cpp @@ -6104,21 +6104,10 @@ void ScrollContainerFrame::UpdateMinimumScaleSize( return; } - WritingMode writingMode = GetWritingMode(); - LogicalRect logicalOverflow(writingMode, aScrollableOverflow, aICBSize); - // Do not incorpolate __underflow__ area into the minimum-scale size, - // otherwise the size will be bigger than expected. - LogicalSize scrollableOverflowSize( - writingMode, - logicalOverflow.IStart(writingMode) + logicalOverflow.ISize(writingMode), - logicalOverflow.BEnd(writingMode) + logicalOverflow.BSize(writingMode)); - // The intrinsic minimum scale is the scale that fits the entire content // width into the visual viewport. CSSToScreenScale intrinsicMinScale( - float(displaySize.width) / - CSSRect::FromAppUnits( - scrollableOverflowSize.GetPhysicalSize(writingMode).width)); + displaySize.width / CSSRect::FromAppUnits(aScrollableOverflow).XMost()); // The scale used to compute the minimum-scale size is the larger of the // intrinsic minimum and the min-scale from the meta viewport tag. diff --git a/layout/reftests/meta-viewport/bug1913951.html b/layout/reftests/meta-viewport/bug1913951.html deleted file mode 100644 index a489a3e42da8..000000000000 --- a/layout/reftests/meta-viewport/bug1913951.html +++ /dev/null @@ -1,22 +0,0 @@ - - -
- - - - - - - - - diff --git a/layout/reftests/meta-viewport/reftest.list b/layout/reftests/meta-viewport/reftest.list index 5608ccf6ab3a..240983dde280 100644 --- a/layout/reftests/meta-viewport/reftest.list +++ b/layout/reftests/meta-viewport/reftest.list @@ -41,7 +41,6 @@ pref(ui.useOverlayScrollbars,1) == overflow-hidden-region-with-negative-left-pos == min-scale-aspect-ratio.html about:blank pref(layout.dynamic-toolbar-max-height,100) == device-height-with-dynamic-toolbar.html device-height-with-dynamic-toolbar-ref.html == reflow-on-minimum-scale-size.html about:blank -== bug1913951.html about:blank # The next two tests (desktop-mode.html and desktop-mode-cleanup.html) must run # consecutively; do not insert anything between them. (As the naming suggests,