зеркало из https://github.com/mozilla/gecko-dev.git
Fix for crash on XPCOM plugins bug 79872 and others r=karnaze sr=attinasi
This commit is contained in:
Родитель
a8385d03ae
Коммит
cacf7af344
|
@ -804,20 +804,11 @@ nsPluginTag::~nsPluginTag()
|
|||
|
||||
void nsPluginTag::TryUnloadPlugin(PRBool aForceShutdown)
|
||||
{
|
||||
// XXX This is a hack to keep Java around, see bug 76936
|
||||
PRBool isJava = PR_FALSE;
|
||||
nsCOMPtr<nsIJVMPlugin> jvm;
|
||||
|
||||
if (mEntryPoint)
|
||||
jvm = do_QueryInterface(mEntryPoint);
|
||||
|
||||
if (jvm) {
|
||||
isJava = PR_TRUE;
|
||||
// release before we shutdown below
|
||||
jvm = nsnull;
|
||||
}
|
||||
|
||||
if (isJava && !aForceShutdown) return;
|
||||
PRBool isXPCOM = PR_FALSE;
|
||||
if (!(mFlags & NS_PLUGIN_FLAG_OLDSCHOOL))
|
||||
isXPCOM = PR_TRUE;
|
||||
|
||||
if (isXPCOM && !aForceShutdown) return;
|
||||
|
||||
if (mEntryPoint)
|
||||
{
|
||||
|
|
|
@ -804,20 +804,11 @@ nsPluginTag::~nsPluginTag()
|
|||
|
||||
void nsPluginTag::TryUnloadPlugin(PRBool aForceShutdown)
|
||||
{
|
||||
// XXX This is a hack to keep Java around, see bug 76936
|
||||
PRBool isJava = PR_FALSE;
|
||||
nsCOMPtr<nsIJVMPlugin> jvm;
|
||||
|
||||
if (mEntryPoint)
|
||||
jvm = do_QueryInterface(mEntryPoint);
|
||||
|
||||
if (jvm) {
|
||||
isJava = PR_TRUE;
|
||||
// release before we shutdown below
|
||||
jvm = nsnull;
|
||||
}
|
||||
|
||||
if (isJava && !aForceShutdown) return;
|
||||
PRBool isXPCOM = PR_FALSE;
|
||||
if (!(mFlags & NS_PLUGIN_FLAG_OLDSCHOOL))
|
||||
isXPCOM = PR_TRUE;
|
||||
|
||||
if (isXPCOM && !aForceShutdown) return;
|
||||
|
||||
if (mEntryPoint)
|
||||
{
|
||||
|
|
Загрузка…
Ссылка в новой задаче