bug 573382 - allow xpcnativewrappers to not fail-out in chrome manife…

…st - commit on SeaMonkey 2.1a2 RELBRANCH ONLY to enable backwards compat for keeping DOM inspector working --HG-- branch : COMM193a5_20100623_RELBRANCH
leto · Jun 21, 2010 · 28b3c7f · 28b3c7f
1 parent 1af2f35
commit 28b3c7f
Showing 1 changed file with 11 additions and 0 deletions.
diff --git a/chrome/src/nsChromeRegistry.cpp b/chrome/src/nsChromeRegistry.cpp
@@ -1669,6 +1669,9 @@ nsChromeRegistry::ProcessManifestBuffer(char *buf, PRInt32 length,
   NS_NAMED_LITERAL_STRING(kOs, "os");
   NS_NAMED_LITERAL_STRING(kOsVersion, "osversion");
 
+  // Obsolete
+  NS_NAMED_LITERAL_STRING(kXPCNativeWrappers, "xpcnativewrappers");
+
   nsCOMPtr<nsIIOService> io (do_GetIOService());
   if (!io) return NS_ERROR_FAILURE;
 
@@ -1784,6 +1787,14 @@ nsChromeRegistry::ProcessManifestBuffer(char *buf, PRInt32 length,
             CheckVersionFlag(kAppVersion, wtoken, appVersion, vc, stAppVersion))
           continue;
 
+        PRBool xpcNativeWrappers = PR_TRUE; // Dummy for CheckFlag.
+        if (CheckFlag(kXPCNativeWrappers, wtoken, xpcNativeWrappers)) {
+          LogMessageWithContext(aManifest, line, nsIScriptError::warningFlag,
+                                "Warning: Ignoring obsolete chrome registration modifier '%s'.",
+                                token);
+          continue;
+        }
+
         LogMessageWithContext(aManifest, line, nsIScriptError::warningFlag,
                               "Warning: Unrecognized chrome registration modifier '%s'.",
                               token);