Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-01-09 05:14:24 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 314461 make presshell use the new nsIObjectFrame::StopPlugin function

Browse Source 
r+sr=bz
This commit is contained in:
cbiesinger%web.de 2005-11-01 11:37:25 +00:00
parent e4b9244992
commit 2a428dab2c
1 changed files with 2 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
layout/base/nsPresShell.cpp
View File

@ -155,7 +155,7 @@
#include "nsIFocusController.h"
#include "nsIPluginInstance.h"
#include "nsIObjectFrame.h"
#include "nsIPluginHost.h"
#include "nsNetUtil.h"
// Drag & Drop, Clipboard
#include "nsWidgetsCID.h"
@ -6196,30 +6196,7 @@ StopPluginInstance(PresShell *aShell, nsIContent *aContent)
// we're about to make said instance go away
frame->SetProperty(nsLayoutAtoms::objectFrame, NS_INT32_TO_PTR(1));
// Check whether the plugin wants SetWindow to be called before or after
// Stop/Destroy. This is similar to nsObjectFrame::Destroy(), but we
// don't want to destroy the frame just yet.
PRBool callSetWindowLast = PR_FALSE;
instance->GetValue(nsPluginInstanceVariable_CallSetWindowAfterDestroyBool,
(void *) &callSetWindowLast);
if (callSetWindowLast) {
instance->Stop();
instance->Destroy();
instance->SetWindow(nsnull);
} else {
instance->Stop();
instance->SetWindow(nsnull);
instance->Destroy();
}
// XXXbz have to use the plugin manager contract because the plugin host
// registers for two different contracts with two difference CIDs! We want
// the plugin manager CID, since that's the one nsObjectFrame gets.
nsCOMPtr<nsIPluginHost> pluginHost =
do_GetService("@mozilla.org/plugin/manager;1");
if (pluginHost)
pluginHost->StopPluginInstance(instance);
objectFrame->StopPlugin();
}
PR_STATIC_CALLBACK(PRBool)