corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 707886 - Platform support for non-e10s click-to-play plugins. r=jst

Browse Source
This commit is contained in:
Margaret Leibovic
2011-12-09 14:04:15 -08:00
parent cddc010d91
commit 58746392be
7 changed files with 53 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1330,11 +1330,11 @@ nsPluginHost::TrySetUpPluginInstance(const char *aMimeType,
}
nsresult
nsPluginHost::IsPluginEnabledForType(const char* aMimeType)
nsPluginHost::IsPluginEnabledForType(const char* aMimeType, bool aHasBeenClickedToPlay)
{
nsPluginTag *plugin = FindPluginForType(aMimeType, true);
if (plugin)
return NS_OK;
return aHasBeenClickedToPlay ? NS_OK : NS_ERROR_PLUGIN_CLICKTOPLAY;
// Pass false as the second arg so we can return NS_ERROR_PLUGIN_DISABLED
// for disabled plug-ins.
@@ -1349,7 +1349,7 @@ nsPluginHost::IsPluginEnabledForType(const char* aMimeType)
return NS_ERROR_PLUGIN_DISABLED;
}
return NS_OK;
return aHasBeenClickedToPlay ? NS_OK : NS_ERROR_PLUGIN_CLICKTOPLAY;
}
// check comma delimitered extensions
@@ -1379,10 +1379,14 @@ static int CompareExtensions(const char *aExtensionList, const char *aExtension)
nsresult
nsPluginHost::IsPluginEnabledForExtension(const char* aExtension,
const char* &aMimeType)
const char* &aMimeType,
bool aHasBeenClickedToPlay)
{
nsPluginTag *plugin = FindPluginEnabledForExtension(aExtension, aMimeType);
return plugin ? NS_OK : NS_ERROR_FAILURE;
if (plugin)
return aHasBeenClickedToPlay ? NS_OK : NS_ERROR_PLUGIN_CLICKTOPLAY;
return NS_ERROR_FAILURE;
}
class DOMMimeTypeImpl : public nsIDOMMimeType {
@@ -2254,11 +2258,6 @@ nsresult nsPluginHost::ScanPluginsDirectoryList(nsISimpleEnumerator *dirEnum,
nsresult nsPluginHost::LoadPlugins()
{
#ifdef ANDROID
if (XRE_GetProcessType() == GeckoProcessType_Content) {
return NS_OK;
}
#endif
// do not do anything if it is already done
// use ReloadPlugins() to enforce loading
if (mPluginsLoaded)