зеркало из https://github.com/mozilla/gecko-dev.git
implement exception constants defined in DOM level 3
b=245476, patch by jonathan.watt@strath.ac.uk, r=peterv, sr=jst remove redundant declarations and correct comment b=251824, patch by jonathan.watt@strath.ac.uk, r+sr=peterv
This commit is contained in:
Родитель
519fb42879
Коммит
26459a5a95
|
@ -40,15 +40,15 @@
|
|||
#include "domstubs.idl"
|
||||
|
||||
/**
|
||||
* In general, DOM methods return specific error values in ordinary
|
||||
* In general, DOM methods return specific error values in ordinary
|
||||
* processing situations, such as out-of-bound errors.
|
||||
* However, DOM operations can raise exceptions in "exceptional"
|
||||
* circumstances, i.e., when an operation is impossible to perform
|
||||
* (either for logical reasons, because data is lost, or because the
|
||||
* However, DOM operations can raise exceptions in "exceptional"
|
||||
* circumstances, i.e., when an operation is impossible to perform
|
||||
* (either for logical reasons, because data is lost, or because the
|
||||
* implementation has become unstable)
|
||||
*
|
||||
* For more information on this interface please see
|
||||
* http://www.w3.org/TR/DOM-Level-2-Core/
|
||||
* For more information on this interface please see
|
||||
* http://www.w3.org/TR/DOM-Level-3-Core/
|
||||
*
|
||||
* @status FROZEN
|
||||
*/
|
||||
|
@ -76,6 +76,10 @@ interface nsIDOMDOMException : nsISupports
|
|||
const unsigned short NAMESPACE_ERR = 14;
|
||||
// Introduced in DOM Level 2:
|
||||
const unsigned short INVALID_ACCESS_ERR = 15;
|
||||
// Introduced in DOM Level 3:
|
||||
const unsigned short VALIDATION_ERR = 16;
|
||||
// Introduced in DOM Level 3:
|
||||
const unsigned short TYPE_MISMATCH_ERR = 17;
|
||||
|
||||
readonly attribute unsigned long code;
|
||||
};
|
||||
|
|
|
@ -41,7 +41,7 @@
|
|||
#include "nsError.h"
|
||||
|
||||
// XXX If you add a new error code, also add an error string to
|
||||
// dom/base/src/domerr.msg
|
||||
// dom/src/base/domerr.msg
|
||||
|
||||
/* DOM error codes from http://www.w3.org/TR/REC-DOM-Level-1/ */
|
||||
|
||||
|
@ -69,6 +69,11 @@
|
|||
#define NS_ERROR_DOM_RANGE_BAD_BOUNDARYPOINTS_ERR NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_DOM_RANGE, 1)
|
||||
#define NS_ERROR_DOM_RANGE_INVALID_NODE_TYPE_ERR NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_DOM_RANGE, 2)
|
||||
|
||||
/* DOM error codes from http://www.w3.org/TR/DOM-Level-3/ */
|
||||
|
||||
#define NS_ERROR_DOM_VALIDATION_ERR NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_DOM,16)
|
||||
#define NS_ERROR_DOM_TYPE_MISMATCH_ERR NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_DOM,17)
|
||||
|
||||
|
||||
/* DOM error codes defined by us */
|
||||
|
||||
|
|
|
@ -100,9 +100,6 @@ NS_INTERFACE_MAP_END \
|
|||
NS_DEFINE_CID(kBaseDOMException_CID_##domname, NS_BASE_DOM_EXCEPTION_CID); \
|
||||
\
|
||||
nsresult \
|
||||
NS_New##domname(nsresult aNSResult, nsIException* aDefaultException, \
|
||||
nsIException** aException); \
|
||||
nsresult \
|
||||
NS_New##domname(nsresult aNSResult, nsIException* aDefaultException, \
|
||||
nsIException** aException) \
|
||||
{ \
|
||||
|
|
|
@ -64,6 +64,11 @@ DOM_MSG_DEF(NS_ERROR_DOM_SYNTAX_ERR, "An invalid or illegal string was specified
|
|||
DOM_MSG_DEF(NS_ERROR_DOM_RANGE_BAD_BOUNDARYPOINTS_ERR, "The boundary-points of a range does not meet specific requirements.")
|
||||
DOM_MSG_DEF(NS_ERROR_DOM_RANGE_INVALID_NODE_TYPE_ERR, "The container of an boundary-point of a range is being set to either a node of an invalid type or a node with an ancestor of an invalid type.")
|
||||
|
||||
/* DOM error codes from http://www.w3.org/TR/DOM-Level-3/ */
|
||||
|
||||
DOM_MSG_DEF(NS_ERROR_DOM_VALIDATION_ERR, "A call to a method would make the Node invalid with respect to \"partial validity\", so the operation was not done")
|
||||
DOM_MSG_DEF(NS_ERROR_DOM_TYPE_MISMATCH_ERR, "The type of an object is incompatible with the expected type of the parameter associated to the object")
|
||||
|
||||
/* DOM error codes defined by us */
|
||||
|
||||
/* XXX string should be specified by norris */
|
||||
|
|
|
@ -48,11 +48,6 @@ static const char kTypeErrName[] = "NS_ERROR_DOM_TYPE_ERR";
|
|||
static const char kTypeErrMessage[] = NS_ERROR_DOM_TYPE_MSG;
|
||||
|
||||
static void
|
||||
TXResultToNameAndMessage(nsresult aNSResult,
|
||||
const char** aName,
|
||||
const char** aMessage);
|
||||
|
||||
void
|
||||
TXResultToNameAndMessage(nsresult aNSResult,
|
||||
const char** aName,
|
||||
const char** aMessage)
|
||||
|
|
Загрузка…
Ссылка в новой задаче