From f03c0288bf618932fb8bbacb74f3f1163e0ab8ad Mon Sep 17 00:00:00 2001 From: Kris Maglione Date: Tue, 31 Jul 2018 16:38:49 -0700 Subject: [PATCH] Bug 1479945: Part 4 - Remove unused isContract directive flag. r=froydnj MozReview-Commit-ID: DLCiNb39gA8 --HG-- extra : source : 163276881d35942172fd18d8f2cd270fbab1de71 --- xpcom/components/ManifestParser.cpp | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/xpcom/components/ManifestParser.cpp b/xpcom/components/ManifestParser.cpp index 888bd9ba2f8c..db900ea38ea5 100644 --- a/xpcom/components/ManifestParser.cpp +++ b/xpcom/components/ManifestParser.cpp @@ -61,8 +61,6 @@ struct ManifestDirective void (nsChromeRegistry::*regfunc)( nsChromeRegistry::ManifestProcessingContext& aCx, int aLineNo, char* const* aArgv, int aFlags); - - bool isContract; }; static const ManifestDirective kParsingTable[] = { { @@ -696,15 +694,8 @@ ParseManifest(NSLocationType aType, FileLocation& aFile, char* aBuf, (nsChromeRegistry::gChromeRegistry->*(directive->regfunc))( chromecx, line, argv, flags); } else if (directive->ischrome || !aChromeOnly) { - if (directive->isContract) { - CachedDirective* cd = contracts.AppendElement(); - cd->lineno = line; - cd->argv[0] = argv[0]; - cd->argv[1] = argv[1]; - } else { - (nsComponentManagerImpl::gComponentManager->*(directive->mgrfunc))( - mgrcx, line, argv); - } + (nsComponentManagerImpl::gComponentManager->*(directive->mgrfunc))( + mgrcx, line, argv); } }