Oilpan: make shutdown of plugin container objects work better.

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 15 matching lines @@
 #include "bindings/v8/ScriptController.h"
 #include "bindings/v8/npruntime_impl.h"
 #include "core/CSSPropertyNames.h"
 #include "core/HTMLNames.h"
 #include "core/dom/Document.h"
 #include "core/dom/Node.h"
 #include "core/dom/shadow/ShadowRoot.h"
 #include "core/events/Event.h"
 #include "core/frame/FrameView.h"
 #include "core/frame/LocalFrame.h"
+#include "core/frame/Settings.h"
 #include "core/frame/csp/ContentSecurityPolicy.h"
 #include "core/html/HTMLContentElement.h"
 #include "core/html/HTMLImageLoader.h"
 #include "core/html/PluginDocument.h"
 #include "core/loader/FrameLoaderClient.h"
 #include "core/page/EventHandler.h"
 #include "core/page/Page.h"
-#include "core/frame/Settings.h"
 #include "core/plugins/PluginView.h"
 #include "core/rendering/RenderEmbeddedObject.h"
 #include "core/rendering/RenderImage.h"
 #include "core/rendering/RenderWidget.h"
 #include "platform/Logging.h"
 #include "platform/MIMETypeFromURL.h"
 #include "platform/MIMETypeRegistry.h"
 #include "platform/Widget.h"
 #include "platform/plugins/PluginData.h"
 
@@ skipping 140 matching lines @@
         setNeedsWidgetUpdate(true);
     if (m_isDelayingLoadEvent) {
         m_isDelayingLoadEvent = false;
         document().decrementLoadEventDelayCount();
     }
 
     // Only try to persist a plugin widget we actually own.
     Widget* plugin = ownedWidget();
     if (plugin && plugin->pluginShouldPersist())
         m_persistedPluginWidget = plugin;
+#if ENABLE(OILPAN)
+    else if (plugin)
+        plugin->detach();

[haraken, 2014/06/25 05:40:16]

Is it OK to detach the plugin that is persisted by m_persistedPluginWidget?

[sof, 2014/06/25 07:09:32]

We don't any kind of detachment in the non-Oilpan case, but I can look into
this.

[sof, 2014/06/25 09:23:50]

I don't think we should do this as part of this CL. It seems reasonable to make
use of the detach() step now that we have it for the container and the plugin is
being saved away but no longer displayed, but it does change behavior wrt
non-Oilpan.

[haraken, 2014/06/25 09:31:05]

Makes sense, agreed.

+#endif

[haraken, 2014/06/25 05:40:16]

if (plugin) {
#if ENABLE(OILPAN)
  plugin->detach();
#endif
  if (plugin->pluginShouldPersist())
    m_persistedPluginWidget = plugin;
}

     resetInstance();
     // FIXME - is this next line necessary?
     setWidget(nullptr);
 
     if (m_isCapturingMouseEvents) {
         if (LocalFrame* frame = document().frame())
             frame->eventHandler().setCapturingMouseEventsNode(nullptr);
         m_isCapturingMouseEvents = false;
     }
 
@@ skipping 55 matching lines @@
     // return the cached allocated Bindings::Instance. Not supporting this
     // edge-case is OK.
     if (!m_pluginWrapper) {
         Widget* plugin;
 
         if (m_persistedPluginWidget)
             plugin = m_persistedPluginWidget.get();
         else
             plugin = pluginWidget();
 
-        if (plugin)
+        if (plugin) {
             m_pluginWrapper = frame->script().createPluginWrapper(plugin);
+#if ENABLE(OILPAN)
+            plugin->setScriptController(&frame->script());
+#endif
+        }
+
     }
     return m_pluginWrapper.get();
 }
 
 Widget* HTMLPlugInElement::pluginWidget() const
 {
     if (RenderWidget* renderWidget = renderWidgetForJSBindings())
         return renderWidget->widget();
     return 0;
 }
@@ skipping 281 matching lines @@
 {
     return false;
 }
 
 bool HTMLPlugInElement::useFallbackContent() const
 {
     return hasAuthorShadowRoot();
 }
 
 }