Backed out changeset 66c2fb744703 (bug 1656689) for causing Bug 16672…

…75. CLOSED TREE
dothq · Sep 25, 2020 · 035dfde · 035dfde
1 parent b14a771
commit 035dfde
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/layout/base/nsLayoutUtils.cpp b/layout/base/nsLayoutUtils.cpp
@@ -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;
         }
       }