Bug 1479945: Part 1 - Remove nominal support for binary-component directive. r?froydnj draft
authorKris Maglione <maglione.k@gmail.com>
Tue, 31 Jul 2018 16:31:31 -0700
changeset 825124 e174f6d9716000133d6edd92800279e5e7c3aab4
parent 825123 59ece76f35761a43e9b99e3d8c87c2127b58e588
child 825125 4eaa7403778cc0bc2e789726e660758a5cd8c3e7
push id118032
push usermaglione.k@gmail.com
push dateTue, 31 Jul 2018 23:45:47 +0000
reviewersfroydnj
bugs1479945
milestone63.0a1
Bug 1479945: Part 1 - Remove nominal support for binary-component directive. r?froydnj MozReview-Commit-ID: LKF3A7EEY4J
xpcom/components/ManifestParser.cpp
xpcom/components/nsComponentManager.cpp
xpcom/components/nsComponentManager.h
--- 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);