Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-12-03 10:33:33 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 661260: Don't unregister plugins as content handlers just because they are unloaded. Thanks to Rodd Zurcher for his report and proposed solution. r=bsmedberg

Browse Source
This commit is contained in:
Josh Aas 2012-02-13 11:52:58 -05:00
parent 2271cad65a
commit 0d803e1e8a
2 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
dom/plugins/base/nsPluginTags.cpp
View File

@ -230,6 +230,7 @@ nsPluginTag::~nsPluginTag()
NS_IMPL_ISUPPORTS1(nsPluginTag, nsIPluginTag)
#if !defined(XP_WIN) && !defined(XP_MACOSX)
static nsresult ConvertToUTF8(nsIUnicodeDecoder *aUnicodeDecoder,
nsAFlatCString& aString)
{
@ -249,6 +250,7 @@ static nsresult ConvertToUTF8(nsIUnicodeDecoder *aUnicodeDecoder,
return NS_OK;
}
#endif
nsresult nsPluginTag::EnsureMembersAreUTF8()
{
@ -529,10 +531,4 @@ void nsPluginTag::TryUnloadPlugin()
// again so the calling code should not be fooled and reload
// the library fresh
mLibrary = nsnull;
// Remove mime types added to the category manager
// only if we were made 'active' by setting the host
if (mPluginHost) {
RegisterWithCategoryManager(false, nsPluginTag::ePluginUnregister);
}
}

2
dom/plugins/base/nsPluginTags.h
View File

@ -87,7 +87,7 @@ public:
PRInt64 aLastModifiedTime = 0,
bool aCanUnload = true,
bool aArgsAreUTF8 = false);
~nsPluginTag();
virtual ~nsPluginTag();
void SetHost(nsPluginHost * aHost);
void TryUnloadPlugin();