Index: third_party/WebKit/Source/core/frame/FrameView.cpp |
diff --git a/third_party/WebKit/Source/core/frame/FrameView.cpp b/third_party/WebKit/Source/core/frame/FrameView.cpp |
index 524a545afcde974c18c366e9e7cc1268c16b0b54..01eb6a61c51437e79d986c6d2a6f0bb94c47c035 100644 |
--- a/third_party/WebKit/Source/core/frame/FrameView.cpp |
+++ b/third_party/WebKit/Source/core/frame/FrameView.cpp |
@@ -761,10 +761,8 @@ void FrameView::CalculateScrollbarModesFromOverflowStyle( |
v_mode = kScrollbarAlwaysOn; |
} |
-void FrameView::CalculateScrollbarModes( |
- ScrollbarMode& h_mode, |
- ScrollbarMode& v_mode, |
- ScrollbarModesCalculationStrategy strategy) const { |
+void FrameView::CalculateScrollbarModes(ScrollbarMode& h_mode, |
+ ScrollbarMode& v_mode) const { |
#define RETURN_SCROLLBAR_MODE(mode) \ |
{ \ |
h_mode = v_mode = mode; \ |
@@ -782,7 +780,7 @@ void FrameView::CalculateScrollbarModes( |
RETURN_SCROLLBAR_MODE(kScrollbarAlwaysOff); |
// Scrollbars can be disabled by FrameView::setCanHaveScrollbars. |
- if (!can_have_scrollbars_ && strategy != kRulesFromWebContentOnly) |
+ if (!can_have_scrollbars_) |
RETURN_SCROLLBAR_MODE(kScrollbarAlwaysOff); |
// This will be the LayoutObject for either the body element or the html |
@@ -2733,8 +2731,7 @@ FrameView::ScrollingReasons FrameView::GetScrollingReasons() const { |
// Cover #3 and #4. |
ScrollbarMode horizontal_mode; |
ScrollbarMode vertical_mode; |
- CalculateScrollbarModes(horizontal_mode, vertical_mode, |
- kRulesFromWebContentOnly); |
+ CalculateScrollbarModes(horizontal_mode, vertical_mode); |
if (horizontal_mode == kScrollbarAlwaysOff && |
vertical_mode == kScrollbarAlwaysOff) |
return kNotScrollableExplicitlyDisabled; |