Oilpan: insist on persisted plugin disposal upon clearing.

third_party/WebKit/Source/core/html/HTMLPlugInElement.cpp

 /**
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  *           (C) 2000 Stefan Schimanski (1Stein@gmx.de)
  * Copyright (C) 2004, 2005, 2006 Apple Computer, Inc.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
@@ skipping 96 matching lines @@
 }
 #endif
 
 void HTMLPlugInElement::setPersistedPluginWidget(Widget* widget)
 {
     if (m_persistedPluginWidget == widget)
         return;
 #if ENABLE(OILPAN)
     unregisterAsRenderlessIfNeeded();
     registerAsRenderless(widget);
+    if (m_persistedPluginWidget)
+        m_persistedPluginWidget->dispose();
 #endif
     m_persistedPluginWidget = widget;
 }
 
 #if ENABLE(OILPAN)
 bool HTMLPlugInElement::unregisterAsRenderlessIfNeeded()
 {
     if (!m_persistedPluginWidget || !m_persistedPluginWidget->isPluginView())
         return false;
 
-    // If we are in a renderer-less state, keep the registration.
-    if (!layoutEmbeddedObject())
-        return false;
-
     LocalFrame* frame = toPluginView(m_persistedPluginWidget.get())->pluginFrame();
     ASSERT(frame);
     frame->unregisterPluginElement(this);
     return true;
 }
 
 void HTMLPlugInElement::registerAsRenderless(Widget* widget)
 {
     if (!widget || !widget->isPluginView())
         return;
 
     LocalFrame* frame = toPluginView(widget)->pluginFrame();
     ASSERT(frame);
     frame->registerPluginElement(this);
 }
 #endif
 
 PassRefPtrWillBeRawPtr<Widget> HTMLPlugInElement::releasePersistedPluginWidget()
 {
 #if ENABLE(OILPAN)
-    unregisterAsRenderlessIfNeeded();
+    // If we are in a renderer-less state, keep the registration.
+    if (layoutEmbeddedObject())
+        unregisterAsRenderlessIfNeeded();
 #endif
     return m_persistedPluginWidget.release();
 }
 
 bool HTMLPlugInElement::canProcessDrag() const
 {
     return pluginWidget() && pluginWidget()->isPluginView() && toPluginView(pluginWidget())->canProcessDrag();
 }
 
 bool HTMLPlugInElement::willRespondToMouseClickEvents()
@@ skipping 499 matching lines @@
     return openShadowRoot();
 }
 
 void HTMLPlugInElement::lazyReattachIfNeeded()
 {
     if (!useFallbackContent() && needsWidgetUpdate() && layoutObject() && !isImageType())
         lazyReattachIfAttached();
 }
 
 }