Move CalculateScrollbarModes from FrameView to LayoutView.

third_party/WebKit/Source/core/frame/FrameView.h

Index: third_party/WebKit/Source/core/frame/FrameView.h
diff --git a/third_party/WebKit/Source/core/frame/FrameView.h b/third_party/WebKit/Source/core/frame/FrameView.h
index 0d5277caa4a8593e836a7e21eda5dbc56ccdf103..85c72c51c961360194bf3751452a238b0480926b 100644
--- a/third_party/WebKit/Source/core/frame/FrameView.h
+++ b/third_party/WebKit/Source/core/frame/FrameView.h
@@ -64,7 +64,6 @@
 namespace blink {
 
 class AXObjectCache;
-class ComputedStyle;
 class Cursor;
 class DocumentLifecycle;
 class Element;
@@ -145,7 +144,12 @@ class CORE_EXPORT FrameView final
   LayoutView* GetLayoutView() const;
   LayoutViewItem GetLayoutViewItem() const;
 
+  // If false, prevents scrollbars on the viewport even if web content would
+  // make them appear. Also prevents user-input scrolls (but not programmatic
+  // scrolls).
+  // This API is root-layer-scrolling-aware (affects root PLSA in RLS mode).
   void SetCanHaveScrollbars(bool);
+  bool CanHaveScrollbars() const { return can_have_scrollbars_; }
 
   Scrollbar* CreateScrollbar(ScrollbarOrientation);
 
@@ -362,9 +366,6 @@ class CORE_EXPORT FrameView final
   bool IsScrollable() const override;
   bool IsProgrammaticallyScrollable() override;
 
-  void CalculateScrollbarModes(ScrollbarMode& h_mode,

[szager1, 2017/05/22 18:29:35]

So confusing, thanks for getting rid of this.

-                               ScrollbarMode& v_mode) const;
-
   IntPoint LastKnownMousePosition() const override;
   bool ShouldSetCursor() const;
 
@@ -552,11 +553,6 @@ class CORE_EXPORT FrameView final
     horizontal_scrollbar_lock_ = vertical_scrollbar_lock_ = lock;
   }
 
-  bool CanHaveScrollbars() const {
-    return HorizontalScrollbarMode() != kScrollbarAlwaysOff ||
-           VerticalScrollbarMode() != kScrollbarAlwaysOff;
-  }
-
   // The visible content rect has a location that is the scrolled offset of
   // the document. The width and height are the layout viewport width and
   // height. By default the scrollbars themselves are excluded from this
@@ -944,10 +940,6 @@ class CORE_EXPORT FrameView final
 
   bool ContentsInCompositedLayer() const;
 
-  void CalculateScrollbarModesFromOverflowStyle(const ComputedStyle*,
-                                                ScrollbarMode& h_mode,
-                                                ScrollbarMode& v_mode) const;
-
   void UpdateCounters();
   void ForceLayoutParentViewIfNeeded();
   void PerformPreLayoutTasks();