Commit 35b198c5 authored by Gabriel Ivăncescu's avatar Gabriel Ivăncescu Committed by Alexandre Julliard

mshtml: Stop the plugin when detaching the plugin host.

Otherwise Gecko keeps it running when it is created via put_classid, and it leaks everything due to holding a ref to it. Signed-off-by: 's avatarGabriel Ivăncescu <gabrielopcode@gmail.com>
parent 5c939222
...@@ -164,6 +164,7 @@ typedef nsISupports nsIControllers; ...@@ -164,6 +164,7 @@ typedef nsISupports nsIControllers;
typedef nsISupports nsIDOMValidityState; typedef nsISupports nsIDOMValidityState;
typedef nsISupports nsIPluginInstanceOwner; typedef nsISupports nsIPluginInstanceOwner;
typedef nsISupports nsIPluginStreamListener; typedef nsISupports nsIPluginStreamListener;
typedef nsISupports nsIPluginTag;
typedef nsISupports nsIContentSink; typedef nsISupports nsIContentSink;
typedef nsISupports nsIParserFilter; typedef nsISupports nsIParserFilter;
typedef nsISupports nsIDTD; typedef nsISupports nsIDTD;
...@@ -180,6 +181,7 @@ typedef nsISupports nsIDOMStorageList; ...@@ -180,6 +181,7 @@ typedef nsISupports nsIDOMStorageList;
typedef nsISupports nsILocalFile; typedef nsISupports nsILocalFile;
typedef nsISupports nsIDOMHTMLMenuElement; typedef nsISupports nsIDOMHTMLMenuElement;
typedef nsISupports nsIDOMCaretPosition; typedef nsISupports nsIDOMCaretPosition;
typedef nsISupports nsIFrame;
typedef nsISupports nsIFrameRequestCallback; typedef nsISupports nsIFrameRequestCallback;
typedef nsISupports nsICycleCollectorListener; typedef nsISupports nsICycleCollectorListener;
typedef nsISupports nsIDOMHTMLCanvasElement; typedef nsISupports nsIDOMHTMLCanvasElement;
...@@ -199,6 +201,7 @@ typedef nsISupports nsIClassInfo; ...@@ -199,6 +201,7 @@ typedef nsISupports nsIClassInfo;
typedef nsISupports nsILoadContext; typedef nsISupports nsILoadContext;
typedef nsISupports nsIDomainPolicy; typedef nsISupports nsIDomainPolicy;
typedef nsISupports nsIScriptContext; typedef nsISupports nsIScriptContext;
typedef nsISupports nsIObjectFrame;
typedef nsISupports nsIObjectInputStream; typedef nsISupports nsIObjectInputStream;
typedef nsISupports nsIObjectOutputStream; typedef nsISupports nsIObjectOutputStream;
...@@ -4301,6 +4304,54 @@ interface nsIPluginInstance : nsIAudioChannelAgentCallback ...@@ -4301,6 +4304,54 @@ interface nsIPluginInstance : nsIAudioChannelAgentCallback
[ [
object, object,
uuid(2eb3195e-3eea-4083-bb1d-d2d70fa35ccb),
local
]
interface nsIObjectLoadingContent : nsISupports
{
const UINT TYPE_LOADING = 0;
const UINT TYPE_IMAGE = 1;
const UINT TYPE_PLUGIN = 2;
const UINT TYPE_DOCUMENT = 3;
const UINT TYPE_NULL = 4;
const UINT PLUGIN_UNSUPPORTED = 0;
const UINT PLUGIN_ALTERNATE = 1;
const UINT PLUGIN_DISABLED = 2;
const UINT PLUGIN_BLOCKLISTED = 3;
const UINT PLUGIN_OUTDATED = 4;
const UINT PLUGIN_CRASHED = 5;
const UINT PLUGIN_SUPPRESSED = 6;
const UINT PLUGIN_USER_DISABLED = 7;
const UINT PLUGIN_CLICK_TO_PLAY = 8;
const UINT PLUGIN_VULNERABLE_UPDATABLE = 9;
const UINT PLUGIN_VULNERABLE_NO_UPDATE = 10;
const UINT PLUGIN_ACTIVE = 255;
nsresult GetActualType(nsACString *aType);
nsresult GetDisplayedType(uint32_t *aType);
nsresult GetContentTypeForMIMEType(const nsACString *aMIMEType, uint32_t *aType);
nsresult GetBaseURI(nsIURI **aResult);
nsresult GetPluginInstance(void /*nsNPAPIPluginInstance*/ **aInstance);
nsresult HasNewFrame(nsIObjectFrame *aFrame);
nsresult GetPrintFrame(nsIFrame **aFrame);
nsresult PluginDestroyed();
nsresult PluginCrashed(nsIPluginTag *aPluginTag, const nsAString *pluginDumpID, const nsAString *browserDumpID, bool submittedCrashReport);
nsresult PlayPlugin();
nsresult Reload(bool aClearActivation);
nsresult GetActivated(bool *aActivated);
nsresult StopPluginInstance();
nsresult SyncStartPluginInstance();
nsresult AsyncStartPluginInstance();
nsresult InitializeFromChannel(nsIRequest *aChannel);
nsresult GetSrcURI(nsIURI **aURI);
nsresult GetPluginFallbackType(uint32_t *aPluginFallbackType);
nsresult GetHasRunningPlugin(bool *aHasPlugin);
nsresult GetRunID(uint32_t *aRunID);
}
[
object,
uuid(11afa8be-d997-4e07-a6a3-6f872ec3ee7f), uuid(11afa8be-d997-4e07-a6a3-6f872ec3ee7f),
local local
] ]
......
...@@ -2677,8 +2677,16 @@ void detach_plugin_host(PluginHost *host) ...@@ -2677,8 +2677,16 @@ void detach_plugin_host(PluginHost *host)
host->doc = NULL; host->doc = NULL;
if(host->element) { if(host->element) {
nsIDOMElement *nselem = host->element->element.dom_element;
nsIObjectLoadingContent *olc;
host->element->plugin_host = NULL; host->element->plugin_host = NULL;
host->element = NULL; host->element = NULL;
if(NS_SUCCEEDED(nsIDOMElement_QueryInterface(nselem, &IID_nsIObjectLoadingContent, (void**)&olc))) {
nsIObjectLoadingContent_StopPluginInstance(olc);
nsIObjectLoadingContent_Release(olc);
}
IOleClientSite_Release(&host->IOleClientSite_iface); IOleClientSite_Release(&host->IOleClientSite_iface);
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment