From d3273d2c9b2ee6b445921ab64152f606ce753fb6 Mon Sep 17 00:00:00 2001 From: "jst@mozilla.org" Date: Wed, 30 Apr 2008 14:23:32 -0700 Subject: [PATCH] Fixing bug 431280. Sniff the URI file extension for a mimetype to use if the one given in an embed elements type attribute isn't a supported type. r+sr=bzbarsky@mit.edu, a=dsicore@mozilla.com --- content/base/src/nsObjectLoadingContent.cpp | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/content/base/src/nsObjectLoadingContent.cpp b/content/base/src/nsObjectLoadingContent.cpp index b345d72fc37..3f04456f057 100644 --- a/content/base/src/nsObjectLoadingContent.cpp +++ b/content/base/src/nsObjectLoadingContent.cpp @@ -1075,11 +1075,8 @@ nsObjectLoadingContent::LoadObject(nsIURI* aURI, nsCAutoString overrideType; if ((caps & eOverrideServerType) && - (!aTypeHint.IsEmpty() || + ((!aTypeHint.IsEmpty() && IsSupportedPlugin(aTypeHint)) || (aURI && IsPluginEnabledByExtension(aURI, overrideType)))) { - NS_ASSERTION(aTypeHint.IsEmpty() ^ overrideType.IsEmpty(), - "Exactly one of aTypeHint and overrideType should be empty!"); - ObjectType newType; if (overrideType.IsEmpty()) { newType = GetTypeOfContent(aTypeHint);