Oilpan: move WebPluginLoadObserver to the heap.

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 96 matching lines @@
     NPObject* scriptableObjectForElement() override;
     v8::Local<v8::Object> v8ObjectForElement() override;
     WebString executeScriptURL(const WebURL&, bool popupsAllowed) override;
     void loadFrameRequest(const WebURLRequest&, const WebString& target, bool notifyNeeded, void* notifyData) override;
     bool isRectTopmost(const WebRect&) override;
     void requestTouchEventType(TouchEventRequestType) override;
     void setWantsWheelEvents(bool) override;
     WebPoint rootFrameToLocalPoint(const WebPoint&) override;
     WebPoint localToRootFramePoint(const WebPoint&) override;
 
-    // This cannot be null.
+    // Non-Oilpan, this cannot be null. With Oilpan, it will be
+    // null when in a disposed state, pending finalization during the next GC.
     WebPlugin* plugin() override { return m_webPlugin; }
     void setPlugin(WebPlugin*) override;
 
     float deviceScaleFactor() override;
     float pageScaleFactor() override;
     float pageZoomFactor() override;
 
     virtual void setWebLayer(WebLayer*);
 
     // Printing interface. The plugin can support custom printing
@@ skipping 19 matching lines @@
     // Pass the edit command to the plugin.
     bool executeEditCommand(const WebString& name);
     bool executeEditCommand(const WebString& name, const WebString& value);
 
     // Resource load events for the plugin's source data:
     void didReceiveResponse(const ResourceResponse&) override;
     void didReceiveData(const char *data, int dataLength) override;
     void didFinishLoading() override;
     void didFailLoading(const ResourceError&) override;
 
+#if !ENABLE(OILPAN)
     void willDestroyPluginLoadObserver(WebPluginLoadObserver*);
+#endif
 
     DECLARE_VIRTUAL_TRACE();
     void dispose() override;
 
 #if ENABLE(OILPAN)
     LocalFrame* pluginFrame() const override { return frame(); }
     void shouldDisposePlugin() override;
 #endif
 
 private:
@@ skipping 23 matching lines @@
         IntRect& windowRect,
         IntRect& clipRect,
         IntRect& unobscuredRect,
         Vector<IntRect>& cutOutRects);
     void windowCutOutRects(
         const IntRect& frameRect,
         Vector<IntRect>& cutOutRects);
 
     RawPtrWillBeMember<HTMLPlugInElement> m_element;
     WebPlugin* m_webPlugin;
+#if !ENABLE(OILPAN)
     Vector<WebPluginLoadObserver*> m_pluginLoadObservers;
+#endif
 
     WebLayer* m_webLayer;
 
     IntRect m_pendingInvalidationRect;
 
     TouchEventRequestType m_touchEventRequestType;
     bool m_wantsWheelEvents;
 
     bool m_inDispose;
 #if ENABLE(OILPAN)
     // Oilpan: if true, the plugin container must dispose
     // of its plugin when being finalized.
     bool m_shouldDisposePlugin;
 #endif
 };
 
 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