Remove FrameViewBase as base class of RemoteFrameView.

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 4d596f7c5e8dad2d0081cce8f5a749189809abb3..fd20ad1e8de777f48bef6fb2724f840745adbab0 100644
--- a/third_party/WebKit/Source/core/frame/FrameView.h
+++ b/third_party/WebKit/Source/core/frame/FrameView.h
@@ -40,7 +40,6 @@
 #include "core/paint/PaintInvalidationCapableScrollableArea.h"
 #include "core/paint/PaintPhase.h"
 #include "core/paint/ScrollbarManager.h"
-#include "core/plugins/PluginView.h"
 #include "platform/FrameViewBase.h"
 #include "platform/RuntimeEnabledFeatures.h"
 #include "platform/animation/CompositorAnimationHost.h"
@@ -480,8 +479,7 @@ class CORE_EXPORT FrameView final
   // and repaints to the host window in the window's coordinate space.
   PlatformChromeClient* GetChromeClient() const;
 
-  typedef HeapHashSet<Member<FrameViewBase>> ChildrenSet;
-  typedef HeapHashSet<Member<PluginView>> PluginsSet;
+  typedef HeapHashSet<Member<FrameOrPlugin>> ChildrenSet;
   typedef HeapHashSet<Member<Scrollbar>> ScrollbarsSet;
 
   // Functions for child manipulation and inspection.
@@ -494,19 +492,17 @@ class CORE_EXPORT FrameView final
   bool IsVisible() const {
     return self_visible_ && parent_visible_;
   }  // Whether or not we are actually visible.
-  void SetParentVisible(bool);
+  void SetParentVisible(bool) override;
   void SetSelfVisible(bool v) { self_visible_ = v; }
-  void SetParent(FrameViewBase*) override;
-  FrameViewBase* Parent() const override { return parent_; }
-  void RemoveChild(FrameViewBase*);
-  void AddChild(FrameViewBase*);
-  const ChildrenSet* Children() const { return &children_; }
-  void RemovePlugin(PluginView*);
-  void AddPlugin(PluginView*);
-  const PluginsSet* Plugins() const { return &plugins_; }
+  void SetParent(FrameView*) override;
+  FrameView* Parent() const override { return parent_; }
+  FrameView* Root() const;
+  void RemoveChild(FrameOrPlugin*);
+  void AddChild(FrameOrPlugin*);
+  const ChildrenSet& Children() const { return children_; }
   void RemoveScrollbar(Scrollbar*);
   void AddScrollbar(Scrollbar*);
-  const ScrollbarsSet* Scrollbars() const { return &scrollbars_; }
+  const ScrollbarsSet& Scrollbars() const { return scrollbars_; }
 
   // 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
@@ -653,10 +649,9 @@ class CORE_EXPORT FrameView final
 
   IntRect ConvertToRootFrame(const IntRect&) const;
   IntPoint ConvertToRootFrame(const IntPoint&) const;
-  IntPoint ConvertSelfToChild(const FrameViewBase*, const IntPoint&) const;
+  IntPoint ConvertSelfToChild(const IntPoint&, const IntPoint&) const;
 
-  // FrameViewBase override. Handles painting of the contents of the view as
-  // well as the scrollbars.
+  // Handles painting of the contents of the view as well as the scrollbars.
   void Paint(GraphicsContext&, const CullRect&) const override;
   void Paint(GraphicsContext&, const GlobalPaintFlags, const CullRect&) const;
   void PaintContents(GraphicsContext&,
@@ -670,7 +665,7 @@ class CORE_EXPORT FrameView final
   bool ScrollbarCornerPresent() const;
   IntRect ScrollCornerRect() const override;
 
-  IntPoint ConvertFromContainingFrameViewBaseToScrollbar(
+  IntPoint ConvertFromContainingFrameViewToScrollbar(
       const Scrollbar&,
       const IntPoint&) const override;
 
@@ -972,10 +967,10 @@ class CORE_EXPORT FrameView final
 
   // Methods to do point conversion via layoutObjects, in order to take
   // transforms into account.
-  IntRect ConvertToContainingFrameViewBase(const IntRect&) const;
-  IntPoint ConvertToContainingFrameViewBase(const IntPoint&) const;
-  IntRect ConvertFromContainingFrameViewBase(const IntRect&) const;
-  IntPoint ConvertFromContainingFrameViewBase(const IntPoint&) const;
+  IntRect ConvertToContainingFrameView(const IntRect&) const;
+  IntPoint ConvertToContainingFrameView(const IntPoint&) const;
+  IntRect ConvertFromContainingFrameView(const IntRect&) const;
+  IntPoint ConvertFromContainingFrameView(const IntPoint&) const;
 
   void DidChangeGlobalRootScroller() override;
 
@@ -1069,7 +1064,7 @@ class CORE_EXPORT FrameView final
   EmbeddedObjectSet part_update_set_;
 
   // FIXME: These are just "children" of the FrameView and should be
-  // Member<FrameViewBase> instead.
+  // Member<FrameView> instead.
   HashSet<RefPtr<LayoutPart>> parts_;
 
   Member<LocalFrame> frame_;
@@ -1149,7 +1144,6 @@ class CORE_EXPORT FrameView final
   bool vertical_scrollbar_lock_;
 
   ChildrenSet children_;
-  PluginsSet plugins_;
   ScrollbarsSet scrollbars_;
 
   ScrollOffset pending_scroll_delta_;
@@ -1180,7 +1174,7 @@ class CORE_EXPORT FrameView final
 
   // Paint properties for SPv2 Only.
   // The hierarchy of transform subtree created by a FrameView.
-  // [ preTranslation ]               The offset from FrameViewBase::frameRect.
+  // [ preTranslation ]               The offset from FrameView::FrameRect.
   //     |                            Establishes viewport.
   //     +---[ scrollTranslation ]    Frame scrolling.
   // TODO(trchen): These will not be needed once settings->rootLayerScrolls() is
@@ -1273,10 +1267,15 @@ DEFINE_TYPE_CASTS(FrameView,
                   frameViewBase->IsFrameView(),
                   frameViewBase.IsFrameView());
 DEFINE_TYPE_CASTS(FrameView,
+                  FrameOrPlugin,
+                  frame_or_plugin,
+                  frame_or_plugin->IsFrameView(),
+                  frame_or_plugin.IsFrameView());
+DEFINE_TYPE_CASTS(FrameView,
                   ScrollableArea,
-                  scrollableArea,
-                  scrollableArea->IsFrameView(),
-                  scrollableArea.IsFrameView());
+                  scrollable_area,
+                  scrollable_area->IsFrameView(),
+                  scrollable_area.IsFrameView());
 
 }  // namespace blink