Backing out to try to fix orange

git-svn-id: svn://10.0.0.236/trunk@251039 18797224-902f-48f8-a5cc-f745e15eee43
2008-05-01 19:03:48 +00:00
parent 8ed934e470
commit 40372bcdaa
2 changed files with 8 additions and 7 deletions
--- a/mozilla/content/base/src/nsObjectLoadingContent.cpp
+++ b/mozilla/content/base/src/nsObjectLoadingContent.cpp
@@ -1075,8 +1075,11 @@ nsObjectLoadingContent::LoadObject(nsIURI* aURI,

  nsCAutoString overrideType;
  if ((caps & eOverrideServerType) &&
-      ((!aTypeHint.IsEmpty() && IsSupportedPlugin(aTypeHint)) ||
+      (!aTypeHint.IsEmpty() ||
       (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);