Oilpan: move WebPluginLoadObserver to the heap.

third_party/WebKit/Source/web/WebPluginLoadObserver.cpp

Index: third_party/WebKit/Source/web/WebPluginLoadObserver.cpp
diff --git a/third_party/WebKit/Source/web/WebPluginLoadObserver.cpp b/third_party/WebKit/Source/web/WebPluginLoadObserver.cpp
index 8e1adfcd798cb70c9f5b29e67bb92c14c3baf065..a20e4c2d7ce9ba1575a0c789168f3ed3ab11e2ba 100644
--- a/third_party/WebKit/Source/web/WebPluginLoadObserver.cpp
+++ b/third_party/WebKit/Source/web/WebPluginLoadObserver.cpp
@@ -38,8 +38,23 @@ namespace blink {
 
 WebPluginLoadObserver::~WebPluginLoadObserver()
 {
-    if (m_pluginContainer)
-        m_pluginContainer->willDestroyPluginLoadObserver(this);
+#if !ENABLE(OILPAN)

[haraken, 2015/11/12 15:51:00]

Can we add ASSERT(!m_pluginContainer) to ENABLE(OILPAN)?

[sof, 2015/11/12 18:15:35]

Don't think so; with this and WebPluginContainerImpl dying at the same time, no
weak processing happens.

+    dispose();
+#endif
+}
+
+void WebPluginLoadObserver::dispose()
+{
+    if (!m_pluginContainer)
+        return;
+
+    m_pluginContainer->willDestroyPluginLoadObserver(this);
+    m_pluginContainer = nullptr;
+}
+
+DEFINE_TRACE(WebPluginLoadObserver)
+{
+    visitor->trace(m_pluginContainer);
 }
 
 void WebPluginLoadObserver::didFinishLoading()