зеркало из https://github.com/mozilla/gecko-dev.git
Backed out changeset 602bdd9d5a96 (bug 1461851) for linting failures on /checkouts/gecko/build/appini_header.py on a CLOSED TREE
This commit is contained in:
Родитель
9be1c58dd1
Коммит
bcd412f2a9
|
@ -39,11 +39,6 @@ def main(output, file):
|
||||||
if 'Crash Reporter:serverurl' not in appdata:
|
if 'Crash Reporter:serverurl' not in appdata:
|
||||||
appdata['Crash Reporter:serverurl'] = ''
|
appdata['Crash Reporter:serverurl'] = ''
|
||||||
|
|
||||||
if 'App:sourcerepository' in appdata and 'App:sourcestamp' in appdata:
|
|
||||||
appdata['App:sourceurl'] ='"%(App:sourcerepository)s/rev/%(App:sourcestamp)s"' % appdata
|
|
||||||
else:
|
|
||||||
appdata['App:sourceurl'] = 'NULL'
|
|
||||||
|
|
||||||
output.write('''#include "mozilla/XREAppData.h"
|
output.write('''#include "mozilla/XREAppData.h"
|
||||||
static const mozilla::StaticXREAppData sAppData = {
|
static const mozilla::StaticXREAppData sAppData = {
|
||||||
"%(App:vendor)s",
|
"%(App:vendor)s",
|
||||||
|
@ -57,9 +52,7 @@ def main(output, file):
|
||||||
"%(Gecko:minversion)s",
|
"%(Gecko:minversion)s",
|
||||||
"%(Gecko:maxversion)s",
|
"%(Gecko:maxversion)s",
|
||||||
"%(Crash Reporter:serverurl)s",
|
"%(Crash Reporter:serverurl)s",
|
||||||
%(App:profile)s,
|
%(App:profile)s
|
||||||
NULL, // UAName
|
|
||||||
%(App:sourceurl)s
|
|
||||||
};''' % appdata)
|
};''' % appdata)
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -2705,8 +2705,7 @@ ContentChild::RecvUnlinkGhosts()
|
||||||
mozilla::ipc::IPCResult
|
mozilla::ipc::IPCResult
|
||||||
ContentChild::RecvAppInfo(const nsCString& version, const nsCString& buildID,
|
ContentChild::RecvAppInfo(const nsCString& version, const nsCString& buildID,
|
||||||
const nsCString& name, const nsCString& UAName,
|
const nsCString& name, const nsCString& UAName,
|
||||||
const nsCString& ID, const nsCString& vendor,
|
const nsCString& ID, const nsCString& vendor)
|
||||||
const nsCString& sourceURL)
|
|
||||||
{
|
{
|
||||||
mAppInfo.version.Assign(version);
|
mAppInfo.version.Assign(version);
|
||||||
mAppInfo.buildID.Assign(buildID);
|
mAppInfo.buildID.Assign(buildID);
|
||||||
|
@ -2714,7 +2713,6 @@ ContentChild::RecvAppInfo(const nsCString& version, const nsCString& buildID,
|
||||||
mAppInfo.UAName.Assign(UAName);
|
mAppInfo.UAName.Assign(UAName);
|
||||||
mAppInfo.ID.Assign(ID);
|
mAppInfo.ID.Assign(ID);
|
||||||
mAppInfo.vendor.Assign(vendor);
|
mAppInfo.vendor.Assign(vendor);
|
||||||
mAppInfo.sourceURL.Assign(sourceURL);
|
|
||||||
|
|
||||||
return IPC_OK();
|
return IPC_OK();
|
||||||
}
|
}
|
||||||
|
|
|
@ -100,7 +100,6 @@ public:
|
||||||
nsCString UAName;
|
nsCString UAName;
|
||||||
nsCString ID;
|
nsCString ID;
|
||||||
nsCString vendor;
|
nsCString vendor;
|
||||||
nsCString sourceURL;
|
|
||||||
};
|
};
|
||||||
|
|
||||||
nsresult
|
nsresult
|
||||||
|
@ -419,8 +418,7 @@ public:
|
||||||
|
|
||||||
virtual mozilla::ipc::IPCResult RecvAppInfo(const nsCString& version, const nsCString& buildID,
|
virtual mozilla::ipc::IPCResult RecvAppInfo(const nsCString& version, const nsCString& buildID,
|
||||||
const nsCString& name, const nsCString& UAName,
|
const nsCString& name, const nsCString& UAName,
|
||||||
const nsCString& ID, const nsCString& vendor,
|
const nsCString& ID, const nsCString& vendor) override;
|
||||||
const nsCString& sourceURL) override;
|
|
||||||
|
|
||||||
virtual mozilla::ipc::IPCResult RecvRemoteType(const nsString& aRemoteType) override;
|
virtual mozilla::ipc::IPCResult RecvRemoteType(const nsString& aRemoteType) override;
|
||||||
|
|
||||||
|
|
|
@ -2319,10 +2319,9 @@ ContentParent::InitInternal(ProcessPriority aInitialPriority)
|
||||||
nsCString UAName(gAppData->UAName);
|
nsCString UAName(gAppData->UAName);
|
||||||
nsCString ID(gAppData->ID);
|
nsCString ID(gAppData->ID);
|
||||||
nsCString vendor(gAppData->vendor);
|
nsCString vendor(gAppData->vendor);
|
||||||
nsCString sourceURL(gAppData->sourceURL);
|
|
||||||
|
|
||||||
// Sending all information to content process.
|
// Sending all information to content process.
|
||||||
Unused << SendAppInfo(version, buildID, name, UAName, ID, vendor, sourceURL);
|
Unused << SendAppInfo(version, buildID, name, UAName, ID, vendor);
|
||||||
}
|
}
|
||||||
|
|
||||||
// Send the child its remote type. On Mac, this needs to be sent prior
|
// Send the child its remote type. On Mac, this needs to be sent prior
|
||||||
|
|
|
@ -480,7 +480,7 @@ child:
|
||||||
async ShutdownA11y();
|
async ShutdownA11y();
|
||||||
|
|
||||||
async AppInfo(nsCString version, nsCString buildID, nsCString name, nsCString UAName,
|
async AppInfo(nsCString version, nsCString buildID, nsCString name, nsCString UAName,
|
||||||
nsCString ID, nsCString vendor, nsCString sourceURL);
|
nsCString ID, nsCString vendor);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Send the remote type associated with the content process.
|
* Send the remote type associated with the content process.
|
||||||
|
|
|
@ -715,19 +715,6 @@ nsXULAppInfo::GetUAName(nsACString& aResult)
|
||||||
return NS_OK;
|
return NS_OK;
|
||||||
}
|
}
|
||||||
|
|
||||||
NS_IMETHODIMP
|
|
||||||
nsXULAppInfo::GetSourceURL(nsACString& aResult)
|
|
||||||
{
|
|
||||||
if (XRE_IsContentProcess()) {
|
|
||||||
ContentChild* cc = ContentChild::GetSingleton();
|
|
||||||
aResult = cc->GetAppInfo().sourceURL;
|
|
||||||
return NS_OK;
|
|
||||||
}
|
|
||||||
aResult.Assign(gAppData->sourceURL);
|
|
||||||
|
|
||||||
return NS_OK;
|
|
||||||
}
|
|
||||||
|
|
||||||
NS_IMETHODIMP
|
NS_IMETHODIMP
|
||||||
nsXULAppInfo::GetLogConsoleErrors(bool *aResult)
|
nsXULAppInfo::GetLogConsoleErrors(bool *aResult)
|
||||||
{
|
{
|
||||||
|
|
|
@ -1566,6 +1566,10 @@ StreamMetaJSCustomObject(PSLockRef aLock, SpliceableJSONWriter& aWriter,
|
||||||
|
|
||||||
aWriter.IntProperty("version", 10);
|
aWriter.IntProperty("version", 10);
|
||||||
|
|
||||||
|
#if defined(MOZ_SOURCE_URL)
|
||||||
|
aWriter.StringProperty("sourceURL", "@MOZ_SOURCE_URL@");
|
||||||
|
#endif
|
||||||
|
|
||||||
// The "startTime" field holds the number of milliseconds since midnight
|
// The "startTime" field holds the number of milliseconds since midnight
|
||||||
// January 1, 1970 GMT. This grotty code computes (Now - (Now -
|
// January 1, 1970 GMT. This grotty code computes (Now - (Now -
|
||||||
// ProcessStartTime)) to convert CorePS::ProcessStartTime() into that form.
|
// ProcessStartTime)) to convert CorePS::ProcessStartTime() into that form.
|
||||||
|
@ -1656,10 +1660,6 @@ StreamMetaJSCustomObject(PSLockRef aLock, SpliceableJSONWriter& aWriter,
|
||||||
res = appInfo->GetAppBuildID(string);
|
res = appInfo->GetAppBuildID(string);
|
||||||
if (!NS_FAILED(res))
|
if (!NS_FAILED(res))
|
||||||
aWriter.StringProperty("appBuildID", string.Data());
|
aWriter.StringProperty("appBuildID", string.Data());
|
||||||
|
|
||||||
res = appInfo->GetSourceURL(string);
|
|
||||||
if (!NS_FAILED(res))
|
|
||||||
aWriter.StringProperty("sourceURL", string.Data());
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// We should avoid collecting extension metadata for profiler while XPCOM is
|
// We should avoid collecting extension metadata for profiler while XPCOM is
|
||||||
|
|
|
@ -188,11 +188,6 @@ public:
|
||||||
*/
|
*/
|
||||||
CharPtr UAName;
|
CharPtr UAName;
|
||||||
|
|
||||||
/**
|
|
||||||
* The URL to the source revision for this build of the application.
|
|
||||||
*/
|
|
||||||
CharPtr sourceURL;
|
|
||||||
|
|
||||||
#if defined(XP_WIN) && defined(MOZ_SANDBOX)
|
#if defined(XP_WIN) && defined(MOZ_SANDBOX)
|
||||||
/**
|
/**
|
||||||
* Chromium sandbox BrokerServices.
|
* Chromium sandbox BrokerServices.
|
||||||
|
@ -234,7 +229,6 @@ struct StaticXREAppData
|
||||||
const char* crashReporterURL;
|
const char* crashReporterURL;
|
||||||
const char* profile;
|
const char* profile;
|
||||||
const char* UAName;
|
const char* UAName;
|
||||||
const char* sourceURL;
|
|
||||||
};
|
};
|
||||||
|
|
||||||
} // namespace mozilla
|
} // namespace mozilla
|
||||||
|
|
|
@ -25,7 +25,6 @@ XREAppData::operator=(const StaticXREAppData& aOther)
|
||||||
crashReporterURL = aOther.crashReporterURL;
|
crashReporterURL = aOther.crashReporterURL;
|
||||||
profile = aOther.profile;
|
profile = aOther.profile;
|
||||||
UAName = aOther.UAName;
|
UAName = aOther.UAName;
|
||||||
sourceURL = aOther.sourceURL;
|
|
||||||
|
|
||||||
return *this;
|
return *this;
|
||||||
}
|
}
|
||||||
|
@ -48,7 +47,6 @@ XREAppData::operator=(const XREAppData& aOther)
|
||||||
crashReporterURL = aOther.crashReporterURL;
|
crashReporterURL = aOther.crashReporterURL;
|
||||||
profile = aOther.profile;
|
profile = aOther.profile;
|
||||||
UAName = aOther.UAName;
|
UAName = aOther.UAName;
|
||||||
sourceURL = aOther.sourceURL;
|
|
||||||
#if defined(XP_WIN) && defined(MOZ_SANDBOX)
|
#if defined(XP_WIN) && defined(MOZ_SANDBOX)
|
||||||
sandboxBrokerServices = aOther.sandboxBrokerServices;
|
sandboxBrokerServices = aOther.sandboxBrokerServices;
|
||||||
sandboxPermissionsService = aOther.sandboxPermissionsService;
|
sandboxPermissionsService = aOther.sandboxPermissionsService;
|
||||||
|
|
|
@ -50,10 +50,4 @@ interface nsIXULAppInfo : nsIPlatformInfo
|
||||||
* @returns an empty string if XREAppData.UAName is not set.
|
* @returns an empty string if XREAppData.UAName is not set.
|
||||||
*/
|
*/
|
||||||
readonly attribute ACString UAName;
|
readonly attribute ACString UAName;
|
||||||
|
|
||||||
/**
|
|
||||||
* @see XREAppData.sourceURL
|
|
||||||
* @returns an empty string if XREAppData.sourceURL is not set.
|
|
||||||
*/
|
|
||||||
readonly attribute ACString sourceURL;
|
|
||||||
};
|
};
|
||||||
|
|
Загрузка…
Ссылка в новой задаче