Remove FrameViewBase as base class of PluginView.

third_party/WebKit/Source/web/WebPluginContainerImpl.h

 /*
  * Copyright (C) 2009 Google Inc. All rights reserved.
  * Copyright (C) 2014 Opera Software ASA. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
@@ skipping 16 matching lines @@
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #ifndef WebPluginContainerImpl_h
 #define WebPluginContainerImpl_h
 
 #include "core/dom/ContextLifecycleObserver.h"
 #include "core/plugins/PluginView.h"
-#include "platform/FrameViewBase.h"
+#include "platform/heap/Handle.h"
 #include "platform/wtf/Compiler.h"
 #include "platform/wtf/PassRefPtr.h"
 #include "platform/wtf/Vector.h"
 #include "platform/wtf/text/WTFString.h"
 #include "public/web/WebPluginContainer.h"
 #include "web/WebExport.h"
 
 namespace blink {
 
 class GestureEvent;
 class HTMLFrameOwnerElement;
 class HTMLPlugInElement;
 class IntRect;
 class KeyboardEvent;
 class MouseEvent;
 class ResourceError;
 class ResourceResponse;
 class TouchEvent;
 class WebPlugin;
 class WheelEvent;
 struct WebPrintParams;
 struct WebPrintPresetOptions;
 
 class WEB_EXPORT WebPluginContainerImpl final
-    : public PluginView,
+    : public GarbageCollectedFinalized<WebPluginContainerImpl>,
+      public PluginView,
       NON_EXPORTED_BASE(public WebPluginContainer),
       public ContextClient {
   USING_GARBAGE_COLLECTED_MIXIN(WebPluginContainerImpl);
   USING_PRE_FINALIZER(WebPluginContainerImpl, Dispose);
 
  public:
   static WebPluginContainerImpl* Create(HTMLPlugInElement* element,
                                         WebPlugin* web_plugin) {
     return new WebPluginContainerImpl(element, web_plugin);
   }
+  ~WebPluginContainerImpl() override;
 
   // PluginView methods
+  void SetParent(FrameView*) override;
+  FrameView* Parent() const override { return parent_; };
+  void SetParentVisible(bool) override;
   WebLayer* PlatformLayer() const override;
   v8::Local<v8::Object> ScriptableObject(v8::Isolate*) override;
   bool SupportsKeyboardFocus() const override;
   bool SupportsInputMethod() const override;
   bool CanProcessDrag() const override;
   bool WantsWheelEvents() override;
   void UpdateAllLifecyclePhases() override;
   void InvalidatePaintIfNeeded() override { IssuePaintInvalidations(); }
-
-  // FrameViewBase methods
-  void SetFrameRect(const IntRect&) override;
-  void Paint(GraphicsContext&, const CullRect&) const override;
-  void InvalidateRect(const IntRect&) override;
+  void InvalidateRect(const IntRect&);
   void SetFocused(bool, WebFocusType) override;
-  void Show() override;
-  void Hide() override;
   void HandleEvent(Event*) override;
   void FrameRectsChanged() override;
-  void SetParentVisible(bool) override;
   void GeometryMayHaveChanged() override;
   bool IsPluginContainer() const override { return true; }
   void EventListenersRemoved() override;
 
+  // FrameOrPlugin methods
+  void SetFrameRect(const IntRect& frame_rect) override {
+    frame_rect_ = frame_rect;
+  }
+  const IntRect& FrameRect() const override { return frame_rect_; }
+  void Paint(GraphicsContext&, const CullRect&) const override;
+  void Show() override;
+  void Hide() override;
+
   // WebPluginContainer methods
   WebElement GetElement() override;
   WebDocument GetDocument() override;
   void DispatchProgressEvent(const WebString& type,
                              bool length_computable,
                              unsigned long long loaded,
                              unsigned long long total,
                              const WebString& url) override;
   void EnqueueMessageEvent(const WebDOMMessageEvent&) override;
   void Invalidate() override;
@@ skipping 67 matching lines @@
   // the visible screen of the root frame, in local space of the plugin.
   // Sets |unclippedAbsoluteRect| to the visible rect for the plugin (but
   // without also clipping to the screen), in local space of the plugin.
   void ComputeClipRectsForPlugin(
       const HTMLFrameOwnerElement* plugin_owner_element,
       IntRect& window_rect,
       IntRect& clipped_local_rect,
       IntRect& unclipped_int_local_rect) const;
 
   WebPluginContainerImpl(HTMLPlugInElement*, WebPlugin*);
-  ~WebPluginContainerImpl() override;
 
   void HandleMouseEvent(MouseEvent*);
   void HandleDragEvent(MouseEvent*);
   void HandleWheelEvent(WheelEvent*);
   void HandleKeyboardEvent(KeyboardEvent*);
   void HandleTouchEvent(TouchEvent*);
   void HandleGestureEvent(GestureEvent*);
 
   void SynthesizeMouseEventIfPossible(TouchEvent*);
 
   void FocusPlugin();
 
   void IssuePaintInvalidations();
 
   void CalculateGeometry(IntRect& window_rect,
                          IntRect& clip_rect,
                          IntRect& unobscured_rect,
                          Vector<IntRect>& cut_out_rects);
   void WindowCutOutRects(const IntRect& frame_rect,
                          Vector<IntRect>& cut_out_rects);
 
   friend class WebPluginContainerTest;
 
+  Member<FrameView> parent_;
   Member<HTMLPlugInElement> element_;
   WebPlugin* web_plugin_;
-
   WebLayer* web_layer_;
-
+  IntRect frame_rect_;
   IntRect pending_invalidation_rect_;
-
   TouchEventRequestType touch_event_request_type_;
   bool wants_wheel_events_;
-
+  bool self_visible_;
+  bool parent_visible_;
   bool is_disposed_;
 };
 
 DEFINE_TYPE_CASTS(WebPluginContainerImpl,
-                  FrameViewBase,
-                  frameViewBase,
-                  frameViewBase->IsPluginContainer(),
-                  frameViewBase.IsPluginContainer());
+                  PluginView,
+                  plugin,
+                  plugin->IsPluginContainer(),
+                  plugin.IsPluginContainer());
 // Unlike FrameViewBase, we need not worry about object type for container.
 // WebPluginContainerImpl is the only subclass of WebPluginContainer.
 DEFINE_TYPE_CASTS(WebPluginContainerImpl,
                   WebPluginContainer,
                   container,
                   true,
                   true);
 
 }  // namespace blink
 
 #endif