author | Bobby Holley <bobbyholley@gmail.com> |
Thu, 21 Mar 2013 08:20:46 -0700 | |
changeset 125821 | b2391af8fecb4f421536cf31f7494b5dc60996c9 |
parent 125820 | d4dbfc5c23a3bc36b10fdfecfc497ef5303b6b31 |
child 125822 | 1653ada4e2510d587ea005551848fec7f6a87e78 |
push id | 25109 |
push user | ryanvm@gmail.com |
push date | Thu, 21 Mar 2013 19:52:05 +0000 |
treeherder | mozilla-inbound@a83cbe4e0576 [default view] [failures only] |
perfherder | [talos] [build metrics] [platform microbench] (compared to previous push) |
reviewers | mrbkap |
bugs | 851895 |
milestone | 22.0a1 |
first release with | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
last release without | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
--- a/js/xpconnect/src/XPCWrappedNative.cpp +++ b/js/xpconnect/src/XPCWrappedNative.cpp @@ -2205,21 +2205,16 @@ XPCWrappedNative::CallMethod(XPCCallCont CallMode mode /*= CALL_METHOD */) { XPCContext* xpcc = ccx.GetXPCContext(); NS_ASSERTION(xpcc->CallerTypeIsJavaScript(), "Native caller for XPCWrappedNative::CallMethod?"); nsresult rv = ccx.CanCallNow(); if (NS_FAILED(rv)) { - // If the security manager is complaining then this is not really an - // internal error in xpconnect. So, no reason to botch the assertion. - NS_ASSERTION(rv == NS_ERROR_XPC_SECURITY_MANAGER_VETO, - "hmm? CanCallNow failed in XPCWrappedNative::CallMethod. " - "We are finding out about this late!"); return Throw(rv, ccx); } DEBUG_TrackWrapperCall(ccx.GetWrapper(), mode); // set up the method index and do the security check if needed uint32_t secFlag;