Remove FrameViewBase as base class of PluginView.

third_party/WebKit/Source/core/plugins/PluginView.h

Index: third_party/WebKit/Source/core/plugins/PluginView.h
diff --git a/third_party/WebKit/Source/core/plugins/PluginView.h b/third_party/WebKit/Source/core/plugins/PluginView.h
index 0a1113ca0950fe86d231c3f336ea9f9f2b470d70..206c264c099a3fa5140e8165f7d8525d31a4f5da 100644
--- a/third_party/WebKit/Source/core/plugins/PluginView.h
+++ b/third_party/WebKit/Source/core/plugins/PluginView.h
@@ -29,24 +29,33 @@
 #define PluginView_h
 
 #include "core/CoreExport.h"
-#include "platform/FrameViewBase.h"
+#include "core/frame/FrameOrPlugin.h"
+#include "platform/geometry/IntRect.h"
 #include "platform/scroll/ScrollTypes.h"
 #include "public/platform/WebFocusType.h"
 #include "v8/include/v8.h"
 #include "wtf/text/WTFString.h"
 
 namespace blink {
-class WebLayer;
-}
-
-namespace blink {
 
+class Event;
+class FrameView;
 class ResourceResponse;
+class WebLayer;
 
-class CORE_EXPORT PluginView : public FrameViewBase {
+class CORE_EXPORT PluginView : public FrameOrPlugin {
  public:
-  bool IsPluginView() const final { return true; }
-  virtual void SetFocused(bool, WebFocusType) {}
+  virtual ~PluginView() {}
+
+  virtual void SetParent(FrameView*) = 0;
+  virtual FrameView* Parent() const = 0;
+  virtual void SetParentVisible(bool) = 0;
+  virtual void SetFocused(bool, WebFocusType) = 0;
+  virtual void FrameRectsChanged() = 0;
+  virtual void GeometryMayHaveChanged() = 0;
+  virtual void HandleEvent(Event*) = 0;
+  virtual void EventListenersRemoved() = 0;
+  virtual bool IsPluginContainer() const { return false; }

[dcheng, 2017/04/17 21:09:06]

We may want to consider removing this as well (there is only one subclass of
PluginView now, as far as I can tell): we basically have same situation as
WebViewImpl here now:
https://cs.chromium.org/chromium/src/third_party/WebKit/Source/web/WebViewImp...

[joelhockey, 2017/04/18 00:42:41]

+1.  There is only a single implementation, so I agree there is no need for this
abstraction.  I would then be inclined to rename web/WebPluginContainerImpl to
just web/WebPluginContainer (drop the Impl suffix), but I see that many classes
in web have Impl suffix.

[dcheng, 2017/04/18 00:56:31]

OK, please add a TODO since we're not doing it in this CL.

[joelhockey, 2017/04/18 01:05:16]

Done

 
   virtual WebLayer* PlatformLayer() const { return 0; }
   virtual v8::Local<v8::Object> ScriptableObject(v8::Isolate*) {
@@ -62,17 +71,8 @@ class CORE_EXPORT PluginView : public FrameViewBase {
 
   virtual void UpdateAllLifecyclePhases() {}
   virtual void InvalidatePaintIfNeeded() {}
-
- protected:
-  PluginView() : FrameViewBase() {}
 };
 
-DEFINE_TYPE_CASTS(PluginView,
-                  FrameViewBase,
-                  frameViewBase,
-                  frameViewBase->IsPluginView(),
-                  frameViewBase.IsPluginView());
-
 }  // namespace blink
 
 #endif  // PluginView_h