Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

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
  • Loading branch information...
commit 28b3c7f9d47a060dc4bbb2e68f3c8613b2e5560b 1 parent 1af2f35
@Callek Callek authored
Showing with 11 additions and 0 deletions.
  1. +11 −0 chrome/src/nsChromeRegistry.cpp
View
11 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);
Please sign in to comment.
Something went wrong with that request. Please try again.