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

Bug 392125, Java plugin doesn't stay disabled on restart when disabled via plugin manager, r+sr=jst, a=blocking1.9

Browse Source
This commit is contained in:
flamingice@sourmilk.net 2007-09-04 11:19:31 -07:00
parent 21ed192d17
commit 87928ab0c1
2 changed files with 34 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
modules/plugin/base/src/nsPluginHostImpl.cpp
View File

@ -768,6 +768,7 @@ nsPluginTag::nsPluginTag(nsPluginTag* aPluginTag)
mEntryPoint = nsnull;
mFlags = NS_PLUGIN_FLAG_ENABLED;
mXPConnected = PR_FALSE;
mIsJavaPlugin = aPluginTag->mIsJavaPlugin;
mFileName = new_str(aPluginTag->mFileName);
mFullPath = new_str(aPluginTag->mFullPath);
}
@ -785,12 +786,16 @@ nsPluginTag::nsPluginTag(nsPluginInfo* aPluginInfo)
mMimeTypeArray = nsnull;
mMimeDescriptionArray = nsnull;
mExtensionsArray = nsnull;
mIsJavaPlugin = PR_FALSE;
if(aPluginInfo->fMimeTypeArray != nsnull)
{
mMimeTypeArray = new char*[mVariants];
for (int i = 0; i < mVariants; i++)
for (int i = 0; i < mVariants; i++) {
mMimeTypeArray[i] = new_str(aPluginInfo->fMimeTypeArray[i]);
if (nsPluginHostImpl::IsJavaMIMEType(mMimeTypeArray[i]))
mIsJavaPlugin = PR_TRUE;
}
}
if(aPluginInfo->fMimeDescriptionArray != nsnull)
@ -873,6 +878,7 @@ nsPluginTag::nsPluginTag(const char* aName,
mDescription = new_str(aDescription);
mFileName = new_str(aFileName);
mFullPath = new_str(aFullPath);
mIsJavaPlugin = PR_FALSE;
if (mVariants) {
mMimeTypeArray = new char*[mVariants];
@ -883,6 +889,8 @@ nsPluginTag::nsPluginTag(const char* aName,
mMimeTypeArray[i] = new_str(aMimeTypes[i]);
mMimeDescriptionArray[i] = new_str(aMimeDescriptions[i]);
mExtensionsArray[i] = new_str(aExtensions[i]);
if (nsPluginHostImpl::IsJavaMIMEType(mMimeTypeArray[i]))
mIsJavaPlugin = PR_TRUE;
}
}
}
@ -992,6 +1000,19 @@ nsPluginTag::SetDisabled(PRBool aDisabled)
if (HasFlag(NS_PLUGIN_FLAG_ENABLED) == !aDisabled)
return NS_OK;
if (mIsJavaPlugin) {
nsresult rv;
nsCOMPtr<nsIPrefBranch> pref(do_GetService(NS_PREFSERVICE_CONTRACTID, &rv));
NS_ENSURE_SUCCESS(rv, rv);
PRBool javaEnabled;
rv = pref->GetBoolPref("security.enable_java", &javaEnabled);
NS_ENSURE_SUCCESS(rv, rv);
if (javaEnabled == aDisabled)
return pref->SetBoolPref("security.enable_java", !aDisabled);
}
if (aDisabled)
UnMark(NS_PLUGIN_FLAG_ENABLED);
else
@ -3481,7 +3502,7 @@ NS_IMETHODIMP nsPluginHostImpl::InstantiateEmbeddedPlugin(const char *aMimeType,
return NS_ERROR_NOT_AVAILABLE;
}
PRBool isJava = pluginTag && IsJavaPluginTag(pluginTag);
PRBool isJava = pluginTag && pluginTag->mIsJavaPlugin;
// Determine if the scheme of this URL is one we can handle internaly because we should
// only open the initial stream if it's one that we can handle internally. Otherwise
@ -3645,7 +3666,7 @@ NS_IMETHODIMP nsPluginHostImpl::InstantiateFullPagePlugin(const char *aMimeType,
nsIPluginInstance* instance;
aOwner->GetInstance(instance);
nsPluginTag* pluginTag = FindPluginForType(aMimeType, PR_TRUE);
if(!pluginTag || !IsJavaPluginTag(pluginTag))
if(!pluginTag || !pluginTag->mIsJavaPlugin)
NewFullPagePluginStream(aStreamListener, instance);
NS_IF_RELEASE(instance);
return NS_OK;
@ -3925,7 +3946,7 @@ NS_IMETHODIMP nsPluginHostImpl::TrySetUpPluginInstance(const char *aMimeType,
mimetype = aMimeType;
NS_ASSERTION(pluginTag, "Must have plugin tag here!");
PRBool isJavaPlugin = IsJavaPluginTag(pluginTag);
PRBool isJavaPlugin = pluginTag->mIsJavaPlugin;
#if defined(OJI) && ((defined(XP_UNIX) && !defined(XP_MACOSX)) || defined(XP_OS2))
// This is a work-around on Unix for a LiveConnect problem (bug 83698).
@ -4833,23 +4854,12 @@ static PRBool isUnwantedPlugin(nsPluginTag * tag)
PRBool nsPluginHostImpl::IsUnwantedJavaPlugin(nsPluginTag * tag)
{
#ifndef OJI
return IsJavaPluginTag(tag);
return tag->mIsJavaPlugin;
#else
return PR_FALSE;
#endif /* OJI */
}
PRBool nsPluginHostImpl::IsJavaPluginTag(nsPluginTag * tag)
{
for (PRInt32 i = 0; i < tag->mVariants; ++i) {
if (IsJavaMIMEType(tag->mMimeTypeArray[i])) {
return PR_TRUE;
}
}
return PR_FALSE;
}
PRBool nsPluginHostImpl::IsJavaMIMEType(const char* aType)
{
return aType &&
@ -5150,7 +5160,7 @@ nsresult nsPluginHostImpl::ScanPluginsDirectory(nsIFile * pluginsDir,
pluginTag->mLibrary = pluginLibrary;
pluginTag->mLastModifiedTime = fileModTime;
if (!(oldFlags & NS_PLUGIN_FLAG_ENABLED) ||
(IsJavaPluginTag(pluginTag) && !mJavaEnabled))
(pluginTag->mIsJavaPlugin && !mJavaEnabled))
pluginTag->UnMark(NS_PLUGIN_FLAG_ENABLED);
if (oldFlags & NS_PLUGIN_FLAG_BLOCKLISTED)
@ -5790,7 +5800,7 @@ nsPluginHostImpl::ReadPluginInfo()
// Mark plugin as loaded from cache
tag->Mark(tagflag | NS_PLUGIN_FLAG_FROMCACHE);
if (IsJavaPluginTag(tag)) {
if (tag->mIsJavaPlugin) {
if (mJavaEnabled)
tag->Mark(NS_PLUGIN_FLAG_ENABLED);
else
@ -6435,7 +6445,7 @@ NS_IMETHODIMP nsPluginHostImpl::Observe(nsISupports *aSubject,
// disabled so at least FindPluginForType/Extension doesn't return
// anything.
for (nsPluginTag* cur = mPlugins; cur; cur = cur->mNext) {
if (IsJavaPluginTag(cur))
if (cur->mIsJavaPlugin)
cur->SetDisabled(!mJavaEnabled);
}
}

13
modules/plugin/base/src/nsPluginHostImpl.h
View File

@ -149,6 +149,7 @@ public:
nsIPlugin *mEntryPoint;
PRPackedBool mCanUnloadLibrary;
PRPackedBool mXPConnected;
PRPackedBool mIsJavaPlugin;
char *mFileName;
char *mFullPath;
PRInt64 mLastModifiedTime;
@ -324,6 +325,10 @@ public:
// if it is now disabled
nsresult UpdatePluginInfo(nsPluginTag* aPluginTag);
// checks whether aTag is a "java" plugin tag (a tag for a plugin
// that does Java)
static PRBool IsJavaMIMEType(const char *aType);
private:
NS_IMETHOD
TrySetUpPluginInstance(const char *aMimeType, nsIURI *aURL, nsIPluginInstanceOwner *aOwner);
@ -403,14 +408,6 @@ private:
// (e.g. no OJI support is compiled in)
PRBool IsUnwantedJavaPlugin(nsPluginTag * aPluginTag);
// checks whether aTag is a "java" plugin tag (a tag for a plugin
// that does Java)
PRBool IsJavaPluginTag(nsPluginTag * aPluginTag);
// checks whether aTag is a "java" plugin tag (a tag for a plugin
// that does Java)
PRBool IsJavaMIMEType(const char *aType);
nsresult EnsurePrivateDirServiceProvider();
nsresult GetPrompt(nsIPluginInstanceOwner *aOwner, nsIPrompt **aPrompt);