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 33 matching lines @@
 
 namespace WebCore {
 class GestureEvent;
 class HTMLPlugInElement;
 class IntRect;
 class KeyboardEvent;
 class MouseEvent;
 class PlatformGestureEvent;
 class ResourceError;
 class ResourceResponse;
+#if ENABLE(OILPAN)
+class ScriptController;
+#endif
 class TouchEvent;
 class WheelEvent;
 class Widget;
 }
 
 namespace blink {
 
 struct WebPrintParams;
 
 class ScrollbarGroup;
@@ skipping 91 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;
+    virtual void setScriptController(WebCore::ScriptController*) 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;
 
+#if ENABLE(OILPAN)
+    // Keep a direct reference to the object we've registered with.
+    // Needed for reliable finalization.
+    WebCore::ScriptController* m_scriptController;
+#endif
+
     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