Scrollbar no longer inherits from FrameViewBase.

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 9e3583212752a44cab63b5cdd2e045e8f2b3003a..061869d708f1de0111c96ba48d060c4c8b146b51 100644
--- a/third_party/WebKit/Source/core/frame/FrameView.h
+++ b/third_party/WebKit/Source/core/frame/FrameView.h
@@ -471,6 +471,7 @@ class CORE_EXPORT FrameView final
 
   typedef HeapHashSet<Member<FrameViewBase>> ChildrenSet;
   typedef HeapHashSet<Member<PluginView>> PluginsSet;
+  typedef HeapHashSet<Member<Scrollbar>> ScrollbarsSet;
 
   // Functions for child manipulation and inspection.
   void SetParent(FrameViewBase*) override;
@@ -480,6 +481,9 @@ class CORE_EXPORT FrameView final
   void RemovePlugin(PluginView*);
   void AddPlugin(PluginView*);
   const PluginsSet* Plugins() const { return &plugins_; }
+  void RemoveScrollbar(Scrollbar*);
+  void AddScrollbar(Scrollbar*);
+  const ScrollbarsSet* Scrollbars() const { return &scrollbars_; }

[haraken, 2017/04/24 07:22:17]

I'm assuming that you have already checked all call sites for children_ and
Children() and make sure that you don't need to add the scrollbar version there.
(This CL is moving scrollbars from children_ to scrollbars_, so it must be taken
care of.)

 
   // If the scroll view does not use a native widget, then it will have
   // cross-platform Scrollbars. These functions can be used to obtain those
@@ -1002,10 +1006,6 @@ class CORE_EXPORT FrameView final
   void AdjustScrollOffsetFromUpdateScrollbars();
   bool VisualViewportSuppliesScrollbars();
 
-  bool IsFrameViewScrollbar(const FrameViewBase* child) const {
-    return HorizontalScrollbar() == child || VerticalScrollbar() == child;
-  }
-
   ScrollingCoordinator* GetScrollingCoordinator() const;
 
   void PrepareLayoutAnalyzer();
@@ -1125,6 +1125,7 @@ class CORE_EXPORT FrameView final
 
   ChildrenSet children_;
   PluginsSet plugins_;
+  ScrollbarsSet scrollbars_;
 
   ScrollOffset pending_scroll_delta_;
   ScrollOffset scroll_offset_;