Addressing 22954, patch by amusil, r=av
git-svn-id: svn://10.0.0.236/trunk@73537 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
parent
36b124ebdc
commit
8c4649b786
@ -1780,24 +1780,9 @@ NS_IMETHODIMP nsPluginHostImpl::InstantiateFullPagePlugin(const char *aMimeType,
|
||||
{
|
||||
nsresult rv;
|
||||
nsIURI *url;
|
||||
nsCOMPtr<nsIPluginTagInfo2> pti2 = nsnull;
|
||||
nsPluginTagType tagType;
|
||||
PRBool isJavaEnabled = PR_TRUE;
|
||||
|
||||
rv = aOwner->QueryInterface(kIPluginTagInfo2IID, getter_AddRefs(pti2));
|
||||
|
||||
if(rv != NS_OK) {
|
||||
return rv;
|
||||
}
|
||||
|
||||
rv = pti2->GetTagType(&tagType);
|
||||
|
||||
// PENDING(edburns): do we need to check for nsPluginTagType_Object?
|
||||
if((rv != NS_OK) || !((tagType == nsPluginTagType_Embed) ||
|
||||
(tagType == nsPluginTagType_Applet))) {
|
||||
return rv;
|
||||
}
|
||||
|
||||
#ifdef NS_DEBUG
|
||||
printf("InstantiateFullPagePlugin for %s\n",aMimeType);
|
||||
#endif
|
||||
|
||||
@ -1780,24 +1780,9 @@ NS_IMETHODIMP nsPluginHostImpl::InstantiateFullPagePlugin(const char *aMimeType,
|
||||
{
|
||||
nsresult rv;
|
||||
nsIURI *url;
|
||||
nsCOMPtr<nsIPluginTagInfo2> pti2 = nsnull;
|
||||
nsPluginTagType tagType;
|
||||
PRBool isJavaEnabled = PR_TRUE;
|
||||
|
||||
rv = aOwner->QueryInterface(kIPluginTagInfo2IID, getter_AddRefs(pti2));
|
||||
|
||||
if(rv != NS_OK) {
|
||||
return rv;
|
||||
}
|
||||
|
||||
rv = pti2->GetTagType(&tagType);
|
||||
|
||||
// PENDING(edburns): do we need to check for nsPluginTagType_Object?
|
||||
if((rv != NS_OK) || !((tagType == nsPluginTagType_Embed) ||
|
||||
(tagType == nsPluginTagType_Applet))) {
|
||||
return rv;
|
||||
}
|
||||
|
||||
#ifdef NS_DEBUG
|
||||
printf("InstantiateFullPagePlugin for %s\n",aMimeType);
|
||||
#endif
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user