nagai/fune
3
0
Fork 0
forked from mirrors/gecko-dev
Code Pull requests Activity

Bug 1839401 - Get scrollbar-gutter size from theme instead of scrollbar frame. r=emilio

Browse source 
We don't need scrollbar frame to get the scrollbar size.

Differential Revision: https://phabricator.services.mozilla.com/D191687
This commit is contained in:
Ting-Yu Lin 2023-10-24 18:25:48 +00:00
parent 9ad6043849
commit bf428ac896
2 changed files with 9 additions and 13 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

18
layout/generic/nsGfxScrollFrame.cpp
View file

@ -560,8 +560,8 @@ ScrollReflowInput::ScrollReflowInput(nsHTMLScrollFrame* aFrame,
// makes us suppress scrollbars in CreateAnonymousContent. But if this frame
// initially had a non-'none' scrollbar-width and dynamically changed to
// 'none', then we'll need to handle it here.
if (scrollbarStyle->StyleUIReset()->ScrollbarWidth() ==
StyleScrollbarWidth::None) {
const auto scrollbarWidth = scrollbarStyle->StyleUIReset()->ScrollbarWidth();
if (scrollbarWidth == StyleScrollbarWidth::None) {
mHScrollbar = ShowScrollbar::Never;
mHScrollbarAllowedForScrollingVVInsideLV = false;
mVScrollbar = ShowScrollbar::Never;
@ -574,23 +574,23 @@ ScrollReflowInput::ScrollReflowInput(nsHTMLScrollFrame* aFrame,
const auto bothEdges =
bool(scrollbarGutterStyle & StyleScrollbarGutter::BOTH_EDGES);
const nscoord scrollbarSize = nsHTMLScrollFrame::GetNonOverlayScrollbarSize(
aFrame->PresContext(), scrollbarWidth);
if (mReflowInput.GetWritingMode().IsVertical()) {
const nscoord h = HScrollbarPrefHeight();
if (bothEdges) {
mScrollbarGutter.top = mScrollbarGutter.bottom = h;
mScrollbarGutter.top = mScrollbarGutter.bottom = scrollbarSize;
} else if (stable) {
// The horizontal scrollbar gutter is always at the bottom side.
mScrollbarGutter.bottom = h;
mScrollbarGutter.bottom = scrollbarSize;
}
} else {
const nscoord w = VScrollbarPrefWidth();
if (bothEdges) {
mScrollbarGutter.left = mScrollbarGutter.right = w;
mScrollbarGutter.left = mScrollbarGutter.right = scrollbarSize;
} else if (stable) {
if (aFrame->IsScrollbarOnRight()) {
mScrollbarGutter.right = w;
mScrollbarGutter.right = scrollbarSize;
} else {
mScrollbarGutter.left = w;
mScrollbarGutter.left = scrollbarSize;
}
}
}

4
testing/web-platform/meta/css/css-overflow/scrollbar-gutter-dynamic-002.html.ini
View file

@ -1,4 +0,0 @@
[scrollbar-gutter-dynamic-002.html]
expected:
if os == "android": PASS
FAIL