Move Frame to the Oilpan heap.

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 45 matching lines @@
 class ResourceResponse;
 class ScrollbarGroup;
 class TouchEvent;
 class WebPlugin;
 class WebPluginLoadObserver;
 class WebExternalTextureLayer;
 class WheelEvent;
 class Widget;
 struct WebPrintParams;
 
-class WebPluginContainerImpl FINAL : public PluginView, public WebPluginContainer, public FrameDestructionObserver {
+class WebPluginContainerImpl FINAL
+    : public PluginView
+    , public WebPluginContainer
+#if !ENABLE(OILPAN)
+    , public FrameDestructionObserver
+#endif
+    {
 public:
     static PassRefPtr<WebPluginContainerImpl> create(HTMLPlugInElement* element, WebPlugin* webPlugin)
     {
         return adoptRef(new WebPluginContainerImpl(element, webPlugin));
     }
 
     // PluginView methods
     virtual WebLayer* platformLayer() const OVERRIDE;
     virtual v8::Local<v8::Object> scriptableObject(v8::Isolate*) OVERRIDE;
     virtual bool getFormValue(String&) OVERRIDE;
@@ skipping 108 matching lines @@
     void calculateGeometry(
         const IntRect& frameRect,
         IntRect& windowRect,
         IntRect& clipRect,
         Vector<IntRect>& cutOutRects);
     IntRect windowClipRect() const;
     void windowCutOutRects(
         const IntRect& frameRect,
         Vector<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.
+#if ENABLE(OILPAN)
+    // FIXME: Oilpan: consider moving Widget to the heap, allowing this
+    // container object to be a FrameDestructionObserver. And thereby
+    // keep a traced member reference to the frame rather than as a
+    // bare pointer. Instead, the owning object (HTMLFrameOwnerElement)
+    // explicitly deletes this object when it is disconnected from its
+    // frame. Any access to an invalid frame via this bare pointer
+    // is therefore not possible.
+    //
+    // See the HTMLFrameOwnerElement::disconnectContentFrame comment for
+    // (even) more.
+    LocalFrame* m_frame;
+
+    LocalFrame* frame() const { return m_frame; }
+#endif
+
+    // FIXME: see above; for the time being, a bare pointer to the owning
+    // HTMLPlugInElement and managed as such.
     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, 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