Bug 1479945: Part 1 - Remove nominal support for binary-component directive. r?froydnj
MozReview-Commit-ID: LKF3A7EEY4J
--- a/xpcom/components/ManifestParser.cpp
+++ b/xpcom/components/ManifestParser.cpp
@@ -71,20 +71,16 @@ struct ManifestDirective
bool isContract;
};
static const ManifestDirective kParsingTable[] = {
{
"manifest", 1, false, false, true, true, false,
&nsComponentManagerImpl::ManifestManifest, nullptr,
},
{
- "binary-component", 1, true, true, false, false, false,
- &nsComponentManagerImpl::ManifestBinaryComponent, nullptr,
- },
- {
"component", 2, false, true, false, false, false,
&nsComponentManagerImpl::ManifestComponent, nullptr,
},
{
"contract", 2, false, true, false, false, false,
&nsComponentManagerImpl::ManifestContract, nullptr,
},
{
--- a/xpcom/components/nsComponentManager.cpp
+++ b/xpcom/components/nsComponentManager.cpp
@@ -661,25 +661,16 @@ nsComponentManagerImpl::ManifestManifest
int aLineNo, char* const* aArgv)
{
char* file = aArgv[0];
FileLocation f(aCx.mFile, file);
RegisterManifest(aCx.mType, f, aCx.mChromeOnly);
}
void
-nsComponentManagerImpl::ManifestBinaryComponent(ManifestProcessingContext& aCx,
- int aLineNo,
- char* const* aArgv)
-{
- LogMessageWithContext(aCx.mFile, aLineNo,
- "Binary XPCOM components are no longer supported.");
-}
-
-void
nsComponentManagerImpl::ManifestComponent(ManifestProcessingContext& aCx,
int aLineNo, char* const* aArgv)
{
mLock.AssertNotCurrentThreadOwns();
char* id = aArgv[0];
char* file = aArgv[1];
--- a/xpcom/components/nsComponentManager.h
+++ b/xpcom/components/nsComponentManager.h
@@ -282,18 +282,16 @@ public:
NSLocationType mType;
mozilla::FileLocation mFile;
bool mChromeOnly;
};
void ManifestManifest(ManifestProcessingContext& aCx, int aLineNo,
char* const* aArgv);
- void ManifestBinaryComponent(ManifestProcessingContext& aCx, int aLineNo,
- char* const* aArgv);
void ManifestComponent(ManifestProcessingContext& aCx, int aLineNo,
char* const* aArgv);
void ManifestContract(ManifestProcessingContext& aCx, int aLineNo,
char* const* aArgv);
void ManifestCategory(ManifestProcessingContext& aCx, int aLineNo,
char* const* aArgv);
void RereadChromeManifests(bool aChromeOnly = true);