Oilpan: make shutdown of plugin container objects work better.

Source/web/WebPluginContainerImpl.h

 /*
  * Copyright (C) 2009 Google Inc. 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.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 13 matching lines @@
  * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * 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/frame/FrameDestructionObserver.h"
 #include "core/plugins/PluginView.h"
 #include "platform/Widget.h"
 #include "public/web/WebPluginContainer.h"
 
 #include "wtf/OwnPtr.h"
 #include "wtf/PassRefPtr.h"
 #include "wtf/Vector.h"
 #include "wtf/text/WTFString.h"
 
 struct NPObject;
@@ skipping 14 matching lines @@
 
 namespace blink {
 
 struct WebPrintParams;
 
 class ScrollbarGroup;
 class WebPlugin;
 class WebPluginLoadObserver;
 class WebExternalTextureLayer;
 
-class WebPluginContainerImpl FINAL : public WebCore::PluginView, public WebPluginContainer {
+class WebPluginContainerImpl FINAL : public WebCore::PluginView, public WebPluginContainer, public WebCore::FrameDestructionObserver {
 public:
     static PassRefPtr<WebPluginContainerImpl> create(WebCore::HTMLPlugInElement* element, WebPlugin* webPlugin)
     {
         return adoptRef(new WebPluginContainerImpl(element, webPlugin));
     }
 
     // PluginView methods
     virtual WebLayer* platformLayer() const OVERRIDE;
     virtual NPObject* scriptableObject() OVERRIDE;
     virtual bool getFormValue(String&) OVERRIDE;
@@ skipping 76 matching lines @@
 
     void willDestroyPluginLoadObserver(WebPluginLoadObserver*);
 
     ScrollbarGroup* scrollbarGroup();
 
     void willStartLiveResize();
     void willEndLiveResize();
 
     bool paintCustomOverhangArea(WebCore::GraphicsContext*, const WebCore::IntRect&, const WebCore::IntRect&, const WebCore::IntRect&);
 
+#if ENABLE(OILPAN)
+    virtual void detach() OVERRIDE;
+#endif
+
 private:
     WebPluginContainerImpl(WebCore::HTMLPlugInElement* element, WebPlugin* webPlugin);
     virtual ~WebPluginContainerImpl();
 
     void handleMouseEvent(WebCore::MouseEvent*);
     void handleDragEvent(WebCore::MouseEvent*);
     void handleWheelEvent(WebCore::WheelEvent*);
     void handleKeyboardEvent(WebCore::KeyboardEvent*);
     void handleTouchEvent(WebCore::TouchEvent*);
     void handleGestureEvent(WebCore::GestureEvent*);
 
     void synthesizeMouseEventIfPossible(WebCore::TouchEvent*);
 
     void focusPlugin();
 
     void calculateGeometry(const WebCore::IntRect& frameRect,
                            WebCore::IntRect& windowRect,
                            WebCore::IntRect& clipRect,
                            Vector<WebCore::IntRect>& cutOutRects);
     WebCore::IntRect windowClipRect() const;
     void windowCutOutRects(const WebCore::IntRect& frameRect,
                            Vector<WebCore::IntRect>& cutOutRects);
 
+    // FIXME: Oilpan: consider moving Widget to the heap and turn this
+    // into a traced member. For the time being, it is a bare pointer
+    // of its owning PlugInElement and managed as such.
     WebCore::HTMLPlugInElement* m_element;
     WebPlugin* m_webPlugin;
     Vector<WebPluginLoadObserver*> m_pluginLoadObservers;
 
     WebLayer* m_webLayer;
 
     // The associated scrollbar group object, created lazily. Used for Pepper
     // scrollbars.
     OwnPtr<ScrollbarGroup> m_scrollbarGroup;
 
     TouchEventRequestType m_touchEventRequestType;
     bool m_wantsWheelEvents;
 };
 
 DEFINE_TYPE_CASTS(WebPluginContainerImpl, WebCore::Widget, widget, widget->isPluginContainer(), widget.isPluginContainer());
 // Unlike Widget, 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