Remove FrameViewBase as base class of PluginView.

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

 /*
    Copyright (C) 1997 Martin Jones (mjones@kde.org)
              (C) 1998 Waldo Bastian (bastian@kde.org)
              (C) 1998, 1999 Torben Weis (weis@kde.org)
              (C) 1999 Lars Knoll (knoll@kde.org)
              (C) 1999 Antti Koivisto (koivisto@kde.org)
    Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009 Apple Inc. All rights
    reserved.
 
    This library is free software; you can redistribute it and/or
@@ skipping 11 matching lines @@
    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
    Boston, MA 02110-1301, USA.
 */
 
 #ifndef FrameView_h
 #define FrameView_h
 
 #include <memory>
 #include "core/CoreExport.h"
 #include "core/dom/DocumentLifecycle.h"
+#include "core/frame/FrameOrPlugin.h"
 #include "core/frame/FrameViewAutoSizeInfo.h"
 #include "core/frame/LayoutSubtreeRootList.h"
 #include "core/frame/RootFrameViewport.h"
 #include "core/layout/MapCoordinatesFlags.h"
 #include "core/layout/ScrollAnchor.h"
 #include "core/paint/FirstMeaningfulPaintDetector.h"
 #include "core/paint/ObjectPaintProperties.h"
 #include "core/paint/PaintInvalidationCapableScrollableArea.h"
 #include "core/paint/PaintPhase.h"
 #include "core/paint/ScrollbarManager.h"
@@ skipping 22 matching lines @@
 namespace blink {
 
 class AXObjectCache;
 class ComputedStyle;
 class Cursor;
 class DocumentLifecycle;
 class Element;
 class ElementVisibilityObserver;
 class Frame;
 class FloatSize;
+class IntRect;
 class JSONArray;
 class JSONObject;
 class LayoutItem;
 class LayoutViewItem;
 class LayoutPart;
 class LocalFrame;
 class KURL;
 class Node;
 class LayoutAnalyzer;
 class LayoutBox;
@@ skipping 10 matching lines @@
 class ScrollingCoordinator;
 class TracedValue;
 class TransformState;
 struct AnnotatedRegionValue;
 struct CompositedSelection;
 
 typedef unsigned long long DOMTimeStamp;
 
 class CORE_EXPORT FrameView final
     : public FrameViewBase,
+      public FrameOrPlugin,
       public PaintInvalidationCapableScrollableArea {
   USING_GARBAGE_COLLECTED_MIXIN(FrameView);
 
   friend class PaintControllerPaintTestBase;
   friend class Internals;
   friend class LayoutPart;  // for invalidateTreeIfNeeded
 
  public:
   static FrameView* Create(LocalFrame&);
   static FrameView* Create(LocalFrame&, const IntSize& initial_size);
 
   ~FrameView() override;
 
-  void InvalidateRect(const IntRect&) override;
+  void Invalidate() { InvalidateRect(IntRect(0, 0, Width(), Height())); }
+  void InvalidateRect(const IntRect&);
   void SetFrameRect(const IntRect&) override;
+  const IntRect& FrameRect() const override {
+    return FrameViewBase::FrameRect();
+  }
 
   LocalFrame& GetFrame() const {
     ASSERT(frame_);
     return *frame_;
   }
 
   Page* GetPage() const;
 
   // TODO(pilgrim) replace all instances of layoutView() with layoutViewItem()
   // https://crbug.com/499321
@@ skipping 1130 matching lines @@
                   frameViewBase.IsFrameView());
 DEFINE_TYPE_CASTS(FrameView,
                   ScrollableArea,
                   scrollableArea,
                   scrollableArea->IsFrameView(),
                   scrollableArea.IsFrameView());
 
 }  // namespace blink
 
 #endif  // FrameView_h