зеркало из https://github.com/mozilla/gecko-dev.git
Backed out changeset 4628f9ff25a5 (bug 1740543) for causing build bustages on ErrorNames CLOSED TREE
This commit is contained in:
Родитель
d42b285136
Коммит
1b759d112f
|
@ -16,7 +16,6 @@
|
|||
|
||||
#include "mozilla/Base64.h"
|
||||
#include "mozilla/CycleCollectedJSRuntime.h"
|
||||
#include "mozilla/ErrorNames.h"
|
||||
#include "mozilla/EventStateManager.h"
|
||||
#include "mozilla/IntentionalCrash.h"
|
||||
#include "mozilla/PerformanceMetricsCollector.h"
|
||||
|
@ -291,12 +290,6 @@ void ChromeUtils::AddProfilerMarker(
|
|||
}
|
||||
}
|
||||
|
||||
/* static */
|
||||
void ChromeUtils::GetXPCOMErrorName(GlobalObject& aGlobal, uint32_t aErrorCode,
|
||||
nsACString& aRetval) {
|
||||
GetErrorName((nsresult)aErrorCode, aRetval);
|
||||
}
|
||||
|
||||
/* static */
|
||||
void ChromeUtils::WaiveXrays(GlobalObject& aGlobal, JS::HandleValue aVal,
|
||||
JS::MutableHandleValue aRetval, ErrorResult& aRv) {
|
||||
|
|
|
@ -88,9 +88,6 @@ class ChromeUtils {
|
|||
const ProfilerMarkerOptionsOrDouble& aOptions,
|
||||
const Optional<nsACString>& text);
|
||||
|
||||
static void GetXPCOMErrorName(GlobalObject& aGlobal, uint32_t aErrorCode,
|
||||
nsACString& aRetval);
|
||||
|
||||
static void OriginAttributesToSuffix(
|
||||
GlobalObject& aGlobal, const dom::OriginAttributesDictionary& aAttrs,
|
||||
nsCString& aSuffix);
|
||||
|
|
|
@ -1,40 +0,0 @@
|
|||
"use strict";
|
||||
|
||||
// Test ChromeUtils.getXPCOMErrorName
|
||||
|
||||
add_task(function test_getXPCOMErrorName() {
|
||||
info("Force the initialization of NSS to get the error names right");
|
||||
Cc["@mozilla.org/psm;1"].getService(Ci.nsISupports);
|
||||
|
||||
Assert.equal(
|
||||
ChromeUtils.getXPCOMErrorName(Cr.NS_OK),
|
||||
"NS_OK",
|
||||
"getXPCOMErrorName works for NS_OK"
|
||||
);
|
||||
|
||||
Assert.equal(
|
||||
ChromeUtils.getXPCOMErrorName(Cr.NS_ERROR_FAILURE),
|
||||
"NS_ERROR_FAILURE",
|
||||
"getXPCOMErrorName works for NS_ERROR_FAILURE"
|
||||
);
|
||||
|
||||
const nssErrors = Cc["@mozilla.org/nss_errors_service;1"].getService(
|
||||
Ci.nsINSSErrorsService
|
||||
);
|
||||
Assert.equal(
|
||||
ChromeUtils.getXPCOMErrorName(
|
||||
nssErrors.getXPCOMFromNSSError(Ci.nsINSSErrorsService.NSS_SEC_ERROR_BASE)
|
||||
),
|
||||
"NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_SECURITY, SEC_ERROR_IO)",
|
||||
"getXPCOMErrorName works for NSS_SEC_ERROR_BASE"
|
||||
);
|
||||
// See https://searchfox.org/mozilla-central/rev/a48e21143960b383004afa9ff9411c5cf6d5a958/security/nss/lib/util/secerr.h#20
|
||||
const SEC_ERROR_BAD_DATA = Ci.nsINSSErrorsService.NSS_SEC_ERROR_BASE + 2;
|
||||
Assert.equal(
|
||||
ChromeUtils.getXPCOMErrorName(
|
||||
nssErrors.getXPCOMFromNSSError(SEC_ERROR_BAD_DATA)
|
||||
),
|
||||
"NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_SECURITY, SEC_ERROR_BAD_DATA)",
|
||||
"getXPCOMErrorName works for NSS's SEC_ERROR_BAD_DATA"
|
||||
);
|
||||
});
|
|
@ -54,7 +54,6 @@ head = head_xml.js
|
|||
[test_xmlserializer.js]
|
||||
[test_cancelPrefetch.js]
|
||||
[test_chromeutils_base64.js]
|
||||
[test_chromeutils_getXPCOMErrorName.js]
|
||||
[test_chromeutils_shallowclone.js]
|
||||
[test_generate_xpath.js]
|
||||
head = head_xml.js
|
||||
|
|
|
@ -233,12 +233,6 @@ namespace ChromeUtils {
|
|||
optional (ProfilerMarkerOptions or DOMHighResTimeStamp) options = {},
|
||||
optional UTF8String text);
|
||||
|
||||
/**
|
||||
* Return the symbolic name of any given XPCOM error code (nsresult):
|
||||
* "NS_OK", "NS_ERROR_FAILURE",...
|
||||
*/
|
||||
UTF8String getXPCOMErrorName(unsigned long aErrorCode);
|
||||
|
||||
/**
|
||||
* IF YOU ADD NEW METHODS HERE, MAKE SURE THEY ARE THREAD-SAFE.
|
||||
*/
|
||||
|
|
|
@ -47,7 +47,7 @@ void GetErrorName(nsresult rv, nsACString& name) {
|
|||
name.AppendLiteral(", ");
|
||||
|
||||
const char* nsprName = nullptr;
|
||||
if (isSecurityError && NS_IsMainThread()) {
|
||||
if (isSecurityError) {
|
||||
// Invert the logic from NSSErrorsService::GetXPCOMFromNSSError
|
||||
PRErrorCode nsprCode = -1 * static_cast<PRErrorCode>(NS_ERROR_GET_CODE(rv));
|
||||
nsprName = PR_ErrorToName(nsprCode);
|
||||
|
|
Загрузка…
Ссылка в новой задаче