Bug 316455 Remove nsIPluginInstanceOwner::PluginNotAvailable, which is pointless
now that plugin loading has been rewritten in bug 1156 / bug 309521 r+sr=bz git-svn-id: svn://10.0.0.236/trunk@186777 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
@@ -262,8 +262,6 @@ public:
|
||||
|
||||
NS_IMETHOD GetValue(nsPluginInstancePeerVariable variable, void *value);
|
||||
|
||||
NS_IMETHOD PluginNotAvailable(const char *aMimeType);
|
||||
|
||||
//nsIPluginTagInfo interface
|
||||
|
||||
NS_IMETHOD GetAttributes(PRUint16& n, const char*const*& names,
|
||||
@@ -1921,12 +1919,6 @@ NS_IMETHODIMP nsPluginInstanceOwner::GetValue(nsPluginInstancePeerVariable varia
|
||||
return rv;
|
||||
}
|
||||
|
||||
NS_IMETHODIMP
|
||||
nsPluginInstanceOwner::PluginNotAvailable(const char *aMimeType)
|
||||
{
|
||||
return NS_OK;
|
||||
}
|
||||
|
||||
NS_IMETHODIMP nsPluginInstanceOwner::GetTagType(nsPluginTagType *result)
|
||||
{
|
||||
NS_ENSURE_ARG_POINTER(result);
|
||||
|
||||
@@ -47,7 +47,7 @@ interface nsIDocument;
|
||||
|
||||
[ref] native nsIPluginInstanceRef(nsIPluginInstance *);
|
||||
|
||||
[uuid(18270870-32f1-11d2-a830-0040959a28c9)]
|
||||
[uuid(2e6cc23b-7d4e-4b0a-ad45-f2281c937f5c)]
|
||||
interface nsIPluginInstanceOwner : nsISupports
|
||||
{
|
||||
/**
|
||||
@@ -128,9 +128,4 @@ interface nsIPluginInstanceOwner : nsISupports
|
||||
* Get the specified variable
|
||||
*/
|
||||
void getValue(in nsPluginInstancePeerVariable aVariable, in voidPtr aValue);
|
||||
|
||||
/**
|
||||
* Inform the owner that no plugin for the given mime type was found.
|
||||
*/
|
||||
void pluginNotAvailable(in string aMimeType);
|
||||
};
|
||||
|
||||
@@ -3857,11 +3857,6 @@ NS_IMETHODIMP nsPluginHostImpl::TrySetUpPluginInstance(const char *aMimeType,
|
||||
if (fileExtension.IsEmpty() ||
|
||||
!(pluginTag = FindPluginEnabledForExtension(fileExtension.get(),
|
||||
mimetype))) {
|
||||
|
||||
if (mDefaultPluginDisabled) {
|
||||
aOwner->PluginNotAvailable(aMimeType ? aMimeType : mimetype);
|
||||
}
|
||||
|
||||
return NS_ERROR_FAILURE;
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user