From b62583625b4819323e845b3de9324e623891de0c Mon Sep 17 00:00:00 2001 From: Bobby Holley Date: Thu, 31 May 2012 18:36:15 +0200 Subject: [PATCH] Bug 760076 - Make |construct| use Wrapper::CALL. r=mrbkap --- js/src/jswrapper.cpp | 2 +- js/xpconnect/tests/chrome/Makefile.in | 1 + js/xpconnect/tests/chrome/test_bug760076.xul | 49 ++++++++++++++++++++ 3 files changed, 51 insertions(+), 1 deletion(-) create mode 100644 js/xpconnect/tests/chrome/test_bug760076.xul diff --git a/js/src/jswrapper.cpp b/js/src/jswrapper.cpp index ad24625203a6..0bae7a114284 100644 --- a/js/src/jswrapper.cpp +++ b/js/src/jswrapper.cpp @@ -219,7 +219,7 @@ Wrapper::construct(JSContext *cx, JSObject *wrapper, unsigned argc, Value *argv, { vp->setUndefined(); // default result if we refuse to perform this action const jsid id = JSID_VOID; - GET(IndirectProxyHandler::construct(cx, wrapper, argc, argv, vp)); + CHECKED(IndirectProxyHandler::construct(cx, wrapper, argc, argv, vp), CALL); } bool diff --git a/js/xpconnect/tests/chrome/Makefile.in b/js/xpconnect/tests/chrome/Makefile.in index 227c95938206..3f2c1405e99b 100644 --- a/js/xpconnect/tests/chrome/Makefile.in +++ b/js/xpconnect/tests/chrome/Makefile.in @@ -48,6 +48,7 @@ _CHROME_FILES = \ test_weakref.xul \ test_bug726949.xul \ test_bug758563.xul \ + test_bug760076.xul \ $(NULL) # Disabled until this test gets updated to test the new proxy based diff --git a/js/xpconnect/tests/chrome/test_bug760076.xul b/js/xpconnect/tests/chrome/test_bug760076.xul new file mode 100644 index 000000000000..a0eb4904c9b1 --- /dev/null +++ b/js/xpconnect/tests/chrome/test_bug760076.xul @@ -0,0 +1,49 @@ + + + + + + +