diff options
| author | Moonchild <moonchild@palemoon.org> | 2021-01-13 00:25:23 +0000 |
|---|---|---|
| committer | Moonchild <moonchild@palemoon.org> | 2021-01-13 00:25:23 +0000 |
| commit | 51581427794bb41142285bc837e9cf461d8abe7a (patch) | |
| tree | 0be420e6bbd39dbdc889d341fa9a70300b3613c6 /layout/base/nsLayoutUtils.cpp | |
| parent | 7023db88ca13046fda9204b018d8f48f10e44ec4 (diff) | |
| parent | 0939fde1a45d757debf36394c5a76bfb0951b8d7 (diff) | |
| download | UXP-51581427794bb41142285bc837e9cf461d8abe7a.tar UXP-51581427794bb41142285bc837e9cf461d8abe7a.tar.gz UXP-51581427794bb41142285bc837e9cf461d8abe7a.tar.lz UXP-51581427794bb41142285bc837e9cf461d8abe7a.tar.xz UXP-51581427794bb41142285bc837e9cf461d8abe7a.zip | |
Merge pull request 'Add scrollbar-width CSS spec' (#1707) from 1705 into master
Reviewed-on: https://repo.palemoon.org/MoonchildProductions/UXP/pulls/1707
Diffstat (limited to 'layout/base/nsLayoutUtils.cpp')
| -rw-r--r-- | layout/base/nsLayoutUtils.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/layout/base/nsLayoutUtils.cpp b/layout/base/nsLayoutUtils.cpp index 86a11bce9..ccdc5503f 100644 --- a/layout/base/nsLayoutUtils.cpp +++ b/layout/base/nsLayoutUtils.cpp @@ -2023,7 +2023,7 @@ nsLayoutUtils::GetNearestScrollableFrameForDirection(nsIFrame* aFrame, for (nsIFrame* f = aFrame; f; f = nsLayoutUtils::GetCrossDocParentFrame(f)) { nsIScrollableFrame* scrollableFrame = do_QueryFrame(f); if (scrollableFrame) { - ScrollbarStyles ss = scrollableFrame->GetScrollbarStyles(); + ScrollStyles ss = scrollableFrame->GetScrollStyles(); uint32_t directions = scrollableFrame->GetPerceivedScrollingDirections(); if (aDirection == eVertical ? (ss.mVertical != NS_STYLE_OVERFLOW_HIDDEN && @@ -2050,7 +2050,7 @@ nsLayoutUtils::GetNearestScrollableFrame(nsIFrame* aFrame, uint32_t aFlags) return scrollableFrame; } } else { - ScrollbarStyles ss = scrollableFrame->GetScrollbarStyles(); + ScrollStyles ss = scrollableFrame->GetScrollStyles(); if ((aFlags & SCROLLABLE_INCLUDE_HIDDEN) || ss.mVertical != NS_STYLE_OVERFLOW_HIDDEN || ss.mHorizontal != NS_STYLE_OVERFLOW_HIDDEN) { @@ -8255,11 +8255,11 @@ nsLayoutUtils::CalculateScrollableRectForFrame(nsIScrollableFrame* aScrollableFr contentBounds = aScrollableFrame->GetScrollRange(); nsPoint scrollPosition = aScrollableFrame->GetScrollPosition(); - if (aScrollableFrame->GetScrollbarStyles().mVertical == NS_STYLE_OVERFLOW_HIDDEN) { + if (aScrollableFrame->GetScrollStyles().mVertical == NS_STYLE_OVERFLOW_HIDDEN) { contentBounds.y = scrollPosition.y; contentBounds.height = 0; } - if (aScrollableFrame->GetScrollbarStyles().mHorizontal == NS_STYLE_OVERFLOW_HIDDEN) { + if (aScrollableFrame->GetScrollStyles().mHorizontal == NS_STYLE_OVERFLOW_HIDDEN) { contentBounds.x = scrollPosition.x; contentBounds.width = 0; } |