From a65a0bbcf4bb9d7e57742db614e486029f640560 Mon Sep 17 00:00:00 2001
From: "cbiesinger%web.de"
 <cbiesinger%web.de@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Sat, 28 Jan 2006 14:08:55 +0000
Subject: [PATCH] bug 324705 prefer natively handled document types over
 plugins r+sr=bz

git-svn-id: svn://10.0.0.236/trunk@188389 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/content/base/src/nsObjectLoadingContent.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/mozilla/content/base/src/nsObjectLoadingContent.cpp b/mozilla/content/base/src/nsObjectLoadingContent.cpp
index 748be4bc941..8e4d1729321 100644
--- a/mozilla/content/base/src/nsObjectLoadingContent.cpp
+++ b/mozilla/content/base/src/nsObjectLoadingContent.cpp
@@ -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");