Oilpan: simplify plugin container finalization.

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 72 matching lines @@
     }
 }
 
 DEFINE_TRACE(HTMLPlugInElement)
 {
     visitor->trace(m_imageLoader);
     visitor->trace(m_persistedPluginWidget);
     HTMLFrameOwnerElement::trace(visitor);
 }
 
-#if ENABLE(OILPAN)
-void HTMLPlugInElement::disconnectContentFrame()
-{
-    if (m_persistedPluginWidget) {
-        if (m_persistedPluginWidget->isPluginView())
-            m_persistedPluginWidget->dispose();
-        else
-            ASSERT(m_persistedPluginWidget->isFrameView());
-        m_persistedPluginWidget = nullptr;
-    }
-    HTMLFrameOwnerElement::disconnectContentFrame();
-}
-
-void HTMLPlugInElement::shouldDisposePlugin()
-{
-    if (m_persistedPluginWidget && m_persistedPluginWidget->isPluginView())
-        toPluginView(m_persistedPluginWidget.get())->shouldDisposePlugin();
-}
-#endif
-
 void HTMLPlugInElement::setPersistedPluginWidget(Widget* widget)
 {
     if (m_persistedPluginWidget == widget)
         return;
 #if ENABLE(OILPAN)
-    unregisterAsRenderlessIfNeeded();
-    registerAsRenderless(widget);
     if (m_persistedPluginWidget) {
         if (m_persistedPluginWidget->isPluginView()) {
             m_persistedPluginWidget->hide();
             m_persistedPluginWidget->dispose();
         } else {
             ASSERT(m_persistedPluginWidget->isFrameView());
         }
     }
 #endif
     m_persistedPluginWidget = widget;
 }
 
-#if ENABLE(OILPAN)
-bool HTMLPlugInElement::unregisterAsRenderlessIfNeeded()
-{
-    if (!m_persistedPluginWidget || !m_persistedPluginWidget->isPluginView())
-        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)
-    // 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()
 {
     if (isDisabledFormControl())
         return false;
     LayoutObject* r = layoutObject();
@@ skipping 379 matching lines @@
     LayoutEmbeddedObject* layoutObject = layoutEmbeddedObject();
     // FIXME: This code should not depend on layoutObject!
     if ((!layoutObject && requireLayoutObject) || useFallback)
         return false;
 
     WTF_LOG(Plugins, "%p Plugin URL: %s", this, m_url.utf8().data());
     WTF_LOG(Plugins, "   Loaded URL: %s", url.string().utf8().data());
     m_loadedUrl = url;
 
     if (m_persistedPluginWidget) {
-        setWidget(releasePersistedPluginWidget());
+        setWidget(m_persistedPluginWidget.release());
     } else {
         bool loadManually = document().isPluginDocument() && !document().containsPlugins();
         FrameLoaderClient::DetachedPluginPolicy policy = requireLayoutObject ? FrameLoaderClient::FailOnDetachedPlugin : FrameLoaderClient::AllowDetachedPlugin;
         RefPtrWillBeRawPtr<Widget> widget = frame->loader().client()->createPlugin(this, url, paramNames, paramValues, mimeType, loadManually, policy);
         if (!widget) {
             if (layoutObject && !layoutObject->showsUnavailablePluginIndicator())
                 layoutObject->setPluginUnavailabilityReason(LayoutEmbeddedObject::PluginMissing);
             return false;
         }
 
@@ skipping 95 matching lines @@
     return openShadowRoot();
 }
 
 void HTMLPlugInElement::lazyReattachIfNeeded()
 {
     if (!useFallbackContent() && needsWidgetUpdate() && layoutObject() && !isImageType())
         lazyReattachIfAttached();
 }
 
 }