From 44bb0d75331b2010999d47ef09eabb01f7611ae7 Mon Sep 17 00:00:00 2001 From: "Justin Wood (:Callek)" Date: Sun, 4 Jul 2010 21:54:35 -0400 Subject: [PATCH] Bug 573382 - No chrome package registered for chrome://inspector/content/tasksOverlay.xul r=dtownsend --- xpcom/components/ManifestParser.cpp | 25 ++++++++++++++++++------- 1 file changed, 18 insertions(+), 7 deletions(-) diff --git a/xpcom/components/ManifestParser.cpp b/xpcom/components/ManifestParser.cpp index 688ed86876b6..64bd93789b53 100644 --- a/xpcom/components/ManifestParser.cpp +++ b/xpcom/components/ManifestParser.cpp @@ -426,6 +426,9 @@ ParseManifestCommon(NSLocationType aType, nsILocalFile* aFile, NS_NAMED_LITERAL_STRING(kOsVersion, "osversion"); NS_NAMED_LITERAL_STRING(kABI, "abi"); + // Obsolete + NS_NAMED_LITERAL_STRING(kXPCNativeWrappers, "xpcnativewrappers"); + nsAutoString appID; nsAutoString appVersion; nsAutoString osTarget; @@ -564,16 +567,24 @@ ParseManifestCommon(NSLocationType aType, nsILocalFile* aFile, NS_ConvertASCIItoUTF16 wtoken(token); if (CheckStringFlag(kApplication, wtoken, appID, stApp) || - CheckStringFlag(kOs, wtoken, osTarget, stOs) || + CheckStringFlag(kOs, wtoken, osTarget, stOs) || CheckStringFlag(kABI, wtoken, abi, stABI) || - CheckVersionFlag(kOsVersion, wtoken, osVersion, stOsVersion) || - CheckVersionFlag(kAppVersion, wtoken, appVersion, stAppVersion)) - continue; + CheckVersionFlag(kOsVersion, wtoken, osVersion, stOsVersion) || + CheckVersionFlag(kAppVersion, wtoken, appVersion, stAppVersion)) + continue; if (directive->contentflags && - (CheckFlag(kPlatform, wtoken, platform) || - CheckFlag(kContentAccessible, wtoken, contentAccessible))) - continue; + (CheckFlag(kPlatform, wtoken, platform) || + CheckFlag(kContentAccessible, wtoken, contentAccessible))) + continue; + + bool xpcNativeWrappers = true; // Dummy for CheckFlag. + if (CheckFlag(kXPCNativeWrappers, wtoken, xpcNativeWrappers)) { + LogMessageWithContext(aFile, aPath, line, + "Warning: Ignoring obsolete chrome registration modifier '%s'.", + token); + continue; + } LogMessageWithContext(aFile, aPath, line, "Unrecognized chrome manifest modifier '%s'.",