bug 324705 prefer natively handled document types over plugins
r+sr=bz
This commit is contained in:
@@ -1221,10 +1221,6 @@ nsObjectLoadingContent::GetTypeOfContent(const nsCString& aMIMEType)
|
||||
return eType_Image;
|
||||
}
|
||||
|
||||
if ((caps & eSupportPlugins) && IsSupportedPlugin(aMIMEType)) {
|
||||
return eType_Plugin;
|
||||
}
|
||||
|
||||
PRBool isSVG = aMIMEType.LowerCaseEqualsLiteral("image/svg+xml");
|
||||
#ifdef MOZ_SVG
|
||||
PRBool supportedSVG = isSVG && (caps & eSupportSVG);
|
||||
@@ -1236,6 +1232,10 @@ nsObjectLoadingContent::GetTypeOfContent(const nsCString& aMIMEType)
|
||||
return eType_Document;
|
||||
}
|
||||
|
||||
if ((caps & eSupportPlugins) && IsSupportedPlugin(aMIMEType)) {
|
||||
return eType_Plugin;
|
||||
}
|
||||
|
||||
nsCOMPtr<nsIContent> thisContent =
|
||||
do_QueryInterface(NS_STATIC_CAST(nsIImageLoadingContent*, this));
|
||||
NS_ASSERTION(thisContent, "must be a content");
|
||||
|
||||
Reference in New Issue
Block a user