Backed out changeset 66c2fb744703 (bug 1656689) for causing Bug 1667275. CLOSED TREE

This commit is contained in:
Csoregi Natalia 2020-09-25 12:24:03 +03:00
Родитель b14a77101d
Коммит 035dfdea2b
1 изменённых файлов: 6 добавлений и 4 удалений

Просмотреть файл

@ -2093,17 +2093,19 @@ nsIScrollableFrame* nsLayoutUtils::GetNearestScrollableFrameForDirection(
for (nsIFrame* f = aFrame; f; f = nsLayoutUtils::GetCrossDocParentFrame(f)) {
nsIScrollableFrame* scrollableFrame = do_QueryFrame(f);
if (scrollableFrame) {
uint32_t directions =
scrollableFrame->GetAvailableScrollingDirectionsForUserInputEvents();
ScrollStyles ss = scrollableFrame->GetScrollStyles();
uint32_t directions = scrollableFrame->GetAvailableScrollingDirections();
if (aDirection == ScrollableDirection::Vertical ||
aDirection == ScrollableDirection::Either) {
if (directions & nsIScrollableFrame::VERTICAL) {
if (ss.mVertical != StyleOverflow::Hidden &&
(directions & nsIScrollableFrame::VERTICAL)) {
return scrollableFrame;
}
}
if (aDirection == ScrollableDirection::Horizontal ||
aDirection == ScrollableDirection::Either) {
if (directions & nsIScrollableFrame::HORIZONTAL) {
if (ss.mHorizontal != StyleOverflow::Hidden &&
(directions & nsIScrollableFrame::HORIZONTAL)) {
return scrollableFrame;
}
}