From 0e6a9cc60aeb754e00e466ce20052d2fa9ccb7f9 Mon Sep 17 00:00:00 2001 From: Moonchild Date: Wed, 6 Jan 2021 16:31:36 +0000 Subject: Issue #1705 - Part 3: Rename ScrollbarStyles to ScrollStyles. ScrollbarStyles contains values of overflow, (over)scroll-behavior, etc. The only one which is marginally related to scroll _bars_ is overflow, which can be used to hide scrollbar (by making an element not scrollable) or enforce the scrollbar to display. It makes more sense to be called ScrollStyles as it's mainly concerning behavior of scrolling, not scrollbars. Also, with the addition of scrollbar width properties, the current name can be confusing. --- layout/forms/nsListControlFrame.cpp | 10 +++++----- layout/forms/nsListControlFrame.h | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'layout/forms') diff --git a/layout/forms/nsListControlFrame.cpp b/layout/forms/nsListControlFrame.cpp index 7bd356a22..4daa470a9 100644 --- a/layout/forms/nsListControlFrame.cpp +++ b/layout/forms/nsListControlFrame.cpp @@ -614,17 +614,17 @@ nsListControlFrame::ReflowAsDropdown(nsPresContext* aPresContext, nsHTMLScrollFrame::Reflow(aPresContext, aDesiredSize, state, aStatus); } -ScrollbarStyles -nsListControlFrame::GetScrollbarStyles() const +ScrollStyles +nsListControlFrame::GetScrollStyles() const { // We can't express this in the style system yet; when we can, this can go away - // and GetScrollbarStyles can be devirtualized + // and GetScrollStyles can be devirtualized int32_t style = IsInDropDownMode() ? NS_STYLE_OVERFLOW_AUTO : NS_STYLE_OVERFLOW_SCROLL; if (GetWritingMode().IsVertical()) { - return ScrollbarStyles(style, NS_STYLE_OVERFLOW_HIDDEN); + return ScrollStyles(style, NS_STYLE_OVERFLOW_HIDDEN); } else { - return ScrollbarStyles(NS_STYLE_OVERFLOW_HIDDEN, style); + return ScrollStyles(NS_STYLE_OVERFLOW_HIDDEN, style); } } diff --git a/layout/forms/nsListControlFrame.h b/layout/forms/nsListControlFrame.h index d8df9ebd6..fa939d6c8 100644 --- a/layout/forms/nsListControlFrame.h +++ b/layout/forms/nsListControlFrame.h @@ -106,7 +106,7 @@ public: virtual nsresult SetFormProperty(nsIAtom* aName, const nsAString& aValue) override; virtual void SetFocus(bool aOn = true, bool aRepaint = false) override; - virtual mozilla::ScrollbarStyles GetScrollbarStyles() const override; + virtual mozilla::ScrollStyles GetScrollStyles() const override; virtual bool ShouldPropagateComputedBSizeToScrolledContent() const override; // for accessibility purposes -- cgit v1.2.3