зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1875600
- Remove unused gfxContext parameter for IntrinsicScrollbarGutterSizeAtInlineEdges(). r=hiro
Also, remove a legacy comment. It was for `nsBoxLayoutState`, but the code has been removed in https://hg.mozilla.org/mozilla-central/rev/5ab63cda14e8 Differential Revision: https://phabricator.services.mozilla.com/D199288
This commit is contained in:
Родитель
1055b1302e
Коммит
f6c15bd66a
|
@ -1196,8 +1196,7 @@ void nsHTMLScrollFrame::PlaceScrollArea(ScrollReflowInput& aState,
|
|||
scrolledArea, ReflowChildFlags::Default);
|
||||
}
|
||||
|
||||
nscoord nsHTMLScrollFrame::IntrinsicScrollbarGutterSizeAtInlineEdges(
|
||||
gfxContext* aRenderingContext) {
|
||||
nscoord nsHTMLScrollFrame::IntrinsicScrollbarGutterSizeAtInlineEdges() {
|
||||
const bool isVerticalWM = GetWritingMode().IsVertical();
|
||||
nsScrollbarFrame* inlineEndScrollbarBox =
|
||||
isVerticalWM ? mHScrollbarBox : mVScrollbarBox;
|
||||
|
@ -1231,7 +1230,6 @@ nscoord nsHTMLScrollFrame::IntrinsicScrollbarGutterSizeAtInlineEdges(
|
|||
return 0;
|
||||
}
|
||||
|
||||
// No need to worry about reflow depth here since it's just for scrollbars.
|
||||
nsSize scrollbarPrefSize = inlineEndScrollbarBox->ScrollbarMinSize();
|
||||
const nscoord scrollbarSize =
|
||||
isVerticalWM ? scrollbarPrefSize.height : scrollbarPrefSize.width;
|
||||
|
@ -1268,7 +1266,7 @@ nscoord nsHTMLScrollFrame::GetMinISize(gfxContext* aRenderingContext) {
|
|||
}();
|
||||
|
||||
DISPLAY_MIN_INLINE_SIZE(this, result);
|
||||
return result + IntrinsicScrollbarGutterSizeAtInlineEdges(aRenderingContext);
|
||||
return result + IntrinsicScrollbarGutterSizeAtInlineEdges();
|
||||
}
|
||||
|
||||
/* virtual */
|
||||
|
@ -1278,8 +1276,8 @@ nscoord nsHTMLScrollFrame::GetPrefISize(gfxContext* aRenderingContext) {
|
|||
? *containISize
|
||||
: mScrolledFrame->GetPrefISize(aRenderingContext);
|
||||
DISPLAY_PREF_INLINE_SIZE(this, result);
|
||||
return NSCoordSaturatingAdd(
|
||||
result, IntrinsicScrollbarGutterSizeAtInlineEdges(aRenderingContext));
|
||||
return NSCoordSaturatingAdd(result,
|
||||
IntrinsicScrollbarGutterSizeAtInlineEdges());
|
||||
}
|
||||
|
||||
// When we have perspective set on the outer scroll frame, and transformed
|
||||
|
|
|
@ -110,8 +110,7 @@ class nsHTMLScrollFrame : public nsContainerFrame,
|
|||
// Return the sum of inline-size of the scrollbar gutters (if any) at the
|
||||
// inline-start and inline-end edges of the scroll frame (for a potential
|
||||
// scrollbar that scrolls in the block axis).
|
||||
nscoord IntrinsicScrollbarGutterSizeAtInlineEdges(
|
||||
gfxContext* aRenderingContext);
|
||||
nscoord IntrinsicScrollbarGutterSizeAtInlineEdges();
|
||||
|
||||
bool GetBorderRadii(const nsSize& aFrameSize, const nsSize& aBorderArea,
|
||||
Sides aSkipSides, nscoord aRadii[8]) const final;
|
||||
|
|
Загрузка…
Ссылка в новой задаче