corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 1284674 - Remove NUWA r=cyu

Browse Source 
MozReview-Commit-ID: GyMRNzOBKw6
This commit is contained in:
Alexandre Lissy
2016-08-02 14:54:00 +02:00
parent e5c760a160
commit b2834a3543
86 changed files with 23 additions and 5902 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
xpcom/components/ManifestParser.cpp
View File

@@ -37,18 +37,6 @@
#include "nsIScriptError.h"
#include "nsIXULAppInfo.h"
#include "nsIXULRuntime.h"
#ifdef MOZ_B2G_LOADER
#include "mozilla/XPTInterfaceInfoManager.h"
#endif
#ifdef MOZ_B2G_LOADER
#define XPTONLY_MANIFEST &nsComponentManagerImpl::XPTOnlyManifestManifest
#define XPTONLY_XPT &nsComponentManagerImpl::XPTOnlyManifestXPT
#else
#define XPTONLY_MANIFEST nullptr
#define XPTONLY_XPT nullptr
#endif
using namespace mozilla;
@@ -78,21 +66,14 @@ struct ManifestDirective
void (nsChromeRegistry::*regfunc)(
nsChromeRegistry::ManifestProcessingContext& aCx,
int aLineNo, char* const* aArgv, int aFlags);
#ifdef MOZ_B2G_LOADER
// The function to handle the directive for XPT Only parsing.
void (*xptonlyfunc)(
nsComponentManagerImpl::XPTOnlyManifestProcessingContext& aCx,
int aLineNo, char* const* aArgv);
#else
void* xptonlyfunc;
#endif
bool isContract;
};
static const ManifestDirective kParsingTable[] = {
{
"manifest", 1, false, false, true, true, false,
&nsComponentManagerImpl::ManifestManifest, nullptr, XPTONLY_MANIFEST
&nsComponentManagerImpl::ManifestManifest, nullptr, nullptr
},
{
"binary-component", 1, true, true, false, false, false,
@@ -100,7 +81,7 @@ static const ManifestDirective kParsingTable[] = {
},
{
"interfaces", 1, false, true, false, false, false,
&nsComponentManagerImpl::ManifestXPT, nullptr, XPTONLY_XPT
&nsComponentManagerImpl::ManifestXPT, nullptr, nullptr
},
{
"component", 2, false, true, false, false, false,
@@ -484,9 +465,6 @@ ParseManifest(NSLocationType aType, FileLocation& aFile, char* aBuf,
nsComponentManagerImpl::ManifestProcessingContext mgrcx(aType, aFile,
aChromeOnly);
nsChromeRegistry::ManifestProcessingContext chromecx(aType, aFile);
#ifdef MOZ_B2G_LOADER
nsComponentManagerImpl::XPTOnlyManifestProcessingContext xptonlycx(aFile);
#endif
nsresult rv;
NS_NAMED_LITERAL_STRING(kPlatform, "platform");
@@ -775,11 +753,6 @@ ParseManifest(NSLocationType aType, FileLocation& aFile, char* aBuf,
continue;
}
#ifdef MOZ_B2G_LOADER
if (aXPTOnly) {
directive->xptonlyfunc(xptonlycx, line, argv);
} else
#endif /* MOZ_B2G_LOADER */
if (directive->regfunc) {
if (GeckoProcessType_Default != XRE_GetProcessType()) {
continue;