wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 853911 - Fix nsPluginHost usage in nsPluginTag. r=bsmedberg

Browse Source
This commit is contained in:
Georg Fritzsche 2013-03-23 17:37:08 +01:00
parent b7ea9efd3a
commit 4022065ba0
3 changed files with 12 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dom/plugins/base/nsPluginHost.cpp
View File

@ -2081,8 +2081,6 @@ nsresult nsPluginHost::ScanPluginsDirectory(nsIFile *pluginsDir,
return NS_OK;
}
pluginTag->SetHost(this);
// Add plugin tags such that the list is ordered by modification date,
// newest to oldest. This is ugly, it'd be easier with just about anything
// other than a single-directional linked list.

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

@ -74,8 +74,7 @@ NS_IMPL_ISUPPORTS1(DOMMimeTypeImpl, nsIDOMMimeType)
/* nsPluginTag */
nsPluginTag::nsPluginTag(nsPluginTag* aPluginTag)
: mPluginHost(nullptr),
mName(aPluginTag->mName),
: mName(aPluginTag->mName),
mDescription(aPluginTag->mDescription),
mMimeTypes(aPluginTag->mMimeTypes),
mMimeDescriptions(aPluginTag->mMimeDescriptions),
@ -92,8 +91,7 @@ mNiceFileName()
}
nsPluginTag::nsPluginTag(nsPluginInfo* aPluginInfo)
: mPluginHost(nullptr),
mName(aPluginInfo->fName),
: mName(aPluginInfo->fName),
mDescription(aPluginInfo->fDescription),
mLibrary(nullptr),
mIsJavaPlugin(false),
@ -122,8 +120,7 @@ nsPluginTag::nsPluginTag(const char* aName,
int32_t aVariants,
int64_t aLastModifiedTime,
bool aArgsAreUTF8)
: mPluginHost(nullptr),
mName(aName),
: mName(aName),
mDescription(aDescription),
mLibrary(nullptr),
mIsJavaPlugin(false),
@ -276,11 +273,6 @@ nsresult nsPluginTag::EnsureMembersAreUTF8()
#endif
}
void nsPluginTag::SetHost(nsPluginHost * aHost)
{
mPluginHost = aHost;
}
NS_IMETHODIMP
nsPluginTag::GetDescription(nsACString& aDescription)
{
@ -344,7 +336,9 @@ nsPluginTag::SetEnabled(bool enabled)
SetPluginState(ePluginState_Enabled);
}
mPluginHost->UpdatePluginInfo(this);
if (nsRefPtr<nsPluginHost> host = nsPluginHost::GetInst()) {
host->UpdatePluginInfo(this);
}
}
NS_IMETHODIMP
@ -388,7 +382,9 @@ nsPluginTag::SetBlocklisted(bool blocklisted)
Preferences::ClearUser(pref.get());
}
mPluginHost->UpdatePluginInfo(this);
if (nsRefPtr<nsPluginHost> host = nsPluginHost::GetInst()) {
host->UpdatePluginInfo(this);
}
return NS_OK;
}
@ -418,7 +414,9 @@ nsPluginTag::SetClicktoplay(bool clicktoplay)
SetPluginState(ePluginState_Clicktoplay);
}
mPluginHost->UpdatePluginInfo(this);
if (nsRefPtr<nsPluginHost> host = nsPluginHost::GetInst()) {
host->UpdatePluginInfo(this);
}
return NS_OK;
}

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

@ -48,7 +48,6 @@ public:
bool aArgsAreUTF8 = false);
virtual ~nsPluginTag();
void SetHost(nsPluginHost * aHost);
void TryUnloadPlugin(bool inShutdown);
// plugin is enabled and not blocklisted
@ -69,7 +68,6 @@ public:
nsCString GetNiceFileName();
nsRefPtr<nsPluginTag> mNext;
nsPluginHost *mPluginHost;
nsCString mName; // UTF-8
nsCString mDescription; // UTF-8
nsTArray<nsCString> mMimeTypes; // UTF-8