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

Fixing bug 167601, support PLUGINURL param values for OBJECT tag instead of codebase attribute, r=anthonyd, sr=jst

Browse Source
This commit is contained in:
peterlubczynski%netscape.com 2002-09-26 00:17:20 +00:00
parent bb160689d1
commit b3ac5276f0
1 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
modules/plugin/base/src/nsPluginHostImpl.cpp
View File

@ -3491,26 +3491,28 @@ NS_IMETHODIMP nsPluginHostImpl::InstantiateEmbededPlugin(const char *aMimeType,
* or return failure so layout will replace us.
*
* Currently, the default plugin is shown for all EMBED and APPLET
* tags and also any OBJECT tag that has a CODEBASE attribute.
* tags and also any OBJECT tag that has a PLUGINURL PARAM tag name.
*/
PRBool bHasCodebase = PR_FALSE;
nsCOMPtr<nsIDOMElement> domelement;
pti2->GetDOMElement(getter_AddRefs(domelement));
if (domelement)
domelement->HasAttribute(NS_LITERAL_STRING("codebase"), &bHasCodebase);
PRBool bHasPluginURL = PR_FALSE;
nsCOMPtr<nsIPluginTagInfo2> pti2(do_QueryInterface(aOwner));
if(pti2) {
const char *value;
bHasPluginURL = NS_SUCCEEDED(pti2->GetParameter("PLUGINURL", &value));
}
if(tagType == nsPluginTagType_Object && !bHasCodebase)
// if we didn't find a pluginURL param on the object tag,
// there's nothing more to do here
if(nsPluginTagType_Object == tagType && !bHasPluginURL)
return rv;
nsresult result;
nsresult result = SetUpDefaultPluginInstance(aMimeType, aURL, aOwner);
result = SetUpDefaultPluginInstance(aMimeType, aURL, aOwner);
if(result == NS_OK)
if(NS_SUCCEEDED(result))
result = aOwner->GetInstance(instance);
if(result != NS_OK) {
if(NS_FAILED(result)) {
nsCOMPtr<nsIPrompt> prompt;
GetPrompt(aOwner, getter_AddRefs(prompt));
if(prompt)