Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-25 22:01:30 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed InsertBefore() to allow refChild to be null

Browse Source
This commit is contained in:
troy 1998-05-04 20:33:05 +00:00
parent cd74c826b1
commit a80c1d80ca
1 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
dom/src/nsJSNode.cpp
View File

@ -267,20 +267,26 @@ InsertBefore(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
NS_ASSERTION(2 == argc, "wrong number of arguments");
*rval = JSVAL_NULL;
if (2 == argc) {
// get the arguments
if (JSVAL_IS_OBJECT(argv[0]) && JSVAL_IS_OBJECT(argv[1])) {
// get the arguments. the refChild can be null
if (JSVAL_IS_OBJECT(argv[0]) && (JSVAL_IS_OBJECT(argv[1]) || JSVAL_IS_NULL(argv[1]))) {
JSObject *obj1 = JSVAL_TO_OBJECT(argv[0]);
JSObject *obj2 = JSVAL_TO_OBJECT(argv[1]);
JSObject *obj2 = JSVAL_IS_OBJECT(argv[1]) ? JSVAL_TO_OBJECT(argv[1]) : nsnull;
//XXX should check if that's a good class (do not just GetPrivate)
nsISupports *support1 = (nsISupports*)JS_GetPrivate(cx, obj1);
NS_ASSERTION(nsnull != support1, "null pointer");
nsISupports *support2 = (nsISupports*)JS_GetPrivate(cx, obj2);
NS_ASSERTION(nsnull != support2, "null pointer");
nsISupports *support2 = nsnull;
if (nsnull != obj2) {
support2 = (nsISupports*)JS_GetPrivate(cx, obj2);
NS_ASSERTION(nsnull != support2, "null pointer");
}
nsIDOMNode *node1 = nsnull;
nsIDOMNode *node2 = nsnull;
if (NS_OK == support1->QueryInterface(kIDOMNodeIID, (void**)&node1)) {
if (NS_OK == support2->QueryInterface(kIDOMNodeIID, (void**)&node2)) {
if ((nsnull == support2) ||
(NS_OK == support2->QueryInterface(kIDOMNodeIID, (void**)&node2))) {
// call the function
if (NS_OK == node->InsertBefore(node1, node2)) {
@ -295,7 +301,7 @@ InsertBefore(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
NS_RELEASE(owner);
}
}
NS_RELEASE(node2);
NS_IF_RELEASE(node2);
}
NS_RELEASE(node1);
}