johnson 2.0.0.pre0 → 2.0.0.pre1

data/vendor/tracemonkey/xpconnect/src/xpcquickstubs.h

@@ -289,25 +289,16 @@ struct xpc_qsSelfRef
     nsISupports* ptr;
 };
 
-struct xpc_qsTempRoot
+template<size_t N>
+struct xpc_qsArgValArray
 {
-  public:
-    explicit xpc_qsTempRoot(JSContext *cx)
-        : mContext(cx) {
-        JS_PUSH_SINGLE_TEMP_ROOT(cx, JSVAL_NULL, &mTvr);
-    }
-
-    ~xpc_qsTempRoot() {
-        JS_POP_TEMP_ROOT(mContext, &mTvr);
-    }
-
-    jsval * addr() {
-        return &mTvr.u.value;
+    xpc_qsArgValArray(JSContext *cx) : tvr(cx, N, array)
+    {
+        memset(array, 0, N * sizeof(jsval));
     }
 
-  private:
-    JSContext *mContext;
-    JSTempValueRooter mTvr;
+    JSAutoTempValueRooter tvr;
+    jsval array[N];
 };
 
 /**
@@ -336,10 +327,12 @@ xpc_qsStringToJsval(JSContext *cx, const nsAString &str, jsval *rval);
 JSBool
 xpc_qsUnwrapThisImpl(JSContext *cx,
                      JSObject *obj,
+                     JSObject *callee,
                      const nsIID &iid,
                      void **ppThis,
                      nsISupports **ppThisRef,
-                     jsval *vp);
+                     jsval *vp,
+                     XPCLazyCallContext *lccx);
 
 /**
  * Search @a obj and its prototype chain for an XPCOM object that implements
@@ -361,16 +354,20 @@ template <class T>
 inline JSBool
 xpc_qsUnwrapThis(JSContext *cx,
                  JSObject *obj,
+                 JSObject *callee,
                  T **ppThis,
                  nsISupports **pThisRef,
-                 jsval *pThisVal)
+                 jsval *pThisVal,
+                 XPCLazyCallContext *lccx)
 {
     return xpc_qsUnwrapThisImpl(cx,
                                 obj,
+                                callee,
                                 NS_GET_TEMPLATE_IID(T),
                                 reinterpret_cast<void **>(ppThis),
                                 pThisRef,
-                                pThisVal);
+                                pThisVal,
+                                lccx);
 }
 
 JSBool
@@ -399,15 +396,17 @@ xpc_qsUnwrapThisFromCcx(XPCCallContext &ccx,
 }
 
 nsresult
-xpc_qsUnwrapArgImpl(JSContext *cx, jsval v, const nsIID &iid, void **ppArg);
+xpc_qsUnwrapArgImpl(JSContext *cx, jsval v, const nsIID &iid, void **ppArg,
+                    nsISupports **ppArgRef, jsval *vp);
 
 /** Convert a jsval to an XPCOM pointer. */
 template <class T>
 inline nsresult
-xpc_qsUnwrapArg(JSContext *cx, jsval v, T **ppArg)
+xpc_qsUnwrapArg(JSContext *cx, jsval v, T **ppArg, nsISupports **ppArgRef,
+                jsval *vp)
 {
     return xpc_qsUnwrapArgImpl(cx, v, NS_GET_TEMPLATE_IID(T),
-                               reinterpret_cast<void **>(ppArg));
+                               reinterpret_cast<void **>(ppArg), ppArgRef, vp);
 }
 
 inline nsWrapperCache*
@@ -424,34 +423,21 @@ xpc_qsGetWrapperCache(void *p)
 
 /** Convert an XPCOM pointer to jsval. Return JS_TRUE on success. */
 JSBool
-xpc_qsXPCOMObjectToJsval(XPCCallContext &ccx,
+xpc_qsXPCOMObjectToJsval(XPCLazyCallContext &lccx,
                          nsISupports *p,
                          nsWrapperCache *cache,
-                         XPCNativeInterface *iface,
+                         const nsIID *iid,
+                         XPCNativeInterface **iface,
                          jsval *rval);
 
 /**
  * Convert a variant to jsval. Return JS_TRUE on success.
- *
- * @a paramNum is used in error messages. XPConnect treats the return
- * value as a parameter in this regard.
  */
 JSBool
-xpc_qsVariantToJsval(XPCCallContext &ccx,
+xpc_qsVariantToJsval(XPCLazyCallContext &ccx,
                      nsIVariant *p,
-                     uintN paramNum,
                      jsval *rval);
 
-/**
- * Use this as the setter for readonly attributes. (The IDL readonly
- * keyword does not map to JSPROP_READONLY. Semantic mismatch.)
- *
- * Always fails, with the same error as setting a property that has
- * JSPROP_GETTER but not JSPROP_SETTER.
- */
-JSBool
-xpc_qsReadOnlySetter(JSContext *cx, JSObject *obj, jsval id, jsval *vp);
-
 #ifdef DEBUG
 void
 xpc_qsAssertContextOK(JSContext *cx);
@@ -467,14 +453,4 @@ xpc_qsSameResult(nsISupports *result1, nsISupports *result2)
 #define XPC_QS_ASSERT_CONTEXT_OK(cx) ((void) 0)
 #endif
 
-#define XPC_QS_DEFINE_XPCNATIVEINTERFACE_GETTER(_iface, _iface_cache)         \
-inline XPCNativeInterface*                                                    \
-_iface##_Interface(XPCCallContext& ccx)                                       \
-{                                                                             \
-    if(!(_iface_cache))                                                       \
-        (_iface_cache) =                                                      \
-            XPCNativeInterface::GetNewOrUsed(ccx, &NS_GET_IID(_iface));       \
-    return (_iface_cache);                                                    \
-}
-
 #endif /* xpcquickstubs_h___ */

data/vendor/tracemonkey/xpconnect/src/xpcstring.cpp

@@ -75,14 +75,21 @@ XPCStringConvert::ShutdownDOMStringFinalizer()
 
 // convert a readable to a JSString, copying string data
 // static
-JSString *
-XPCStringConvert::ReadableToJSString(JSContext *cx,
-                                     const nsAString &readable)
+jsval
+XPCStringConvert::ReadableToJSVal(JSContext *cx,
+                                  const nsAString &readable)
 {
     JSString *str;
 
     PRUint32 length = readable.Length();
 
+    JSAtom *atom;
+    if (length == 0 && (atom = cx->runtime->atomState.emptyAtom))
+    {
+        NS_ASSERTION(ATOM_IS_STRING(atom), "What kind of atom is this?");
+        return ATOM_KEY(atom);
+    }
+
     nsStringBuffer *buf = nsStringBuffer::FromString(readable);
     if (buf)
     {
@@ -93,7 +100,7 @@ XPCStringConvert::ReadableToJSString(JSContext *cx,
             sDOMStringFinalizerIndex =
                     JS_AddExternalStringFinalizer(DOMStringFinalizer);
             if (sDOMStringFinalizerIndex == -1)
-                return NULL;
+                return JSVAL_NULL;
         }
 
         str = JS_NewExternalString(cx, 
@@ -111,14 +118,14 @@ XPCStringConvert::ReadableToJSString(JSContext *cx,
                                         (JS_malloc(cx, (length + 1) *
                                                       sizeof(jschar)));
         if (!chars)
-            return NULL;
+            return JSVAL_NULL;
 
         if (length && !CopyUnicodeTo(readable, 0,
                                      reinterpret_cast<PRUnichar *>(chars),
                                      length))
         {
             JS_free(cx, chars);
-            return NULL;
+            return JSVAL_NULL;
         }
 
         chars[length] = 0;
@@ -127,7 +134,7 @@ XPCStringConvert::ReadableToJSString(JSContext *cx,
         if (!str)
             JS_free(cx, chars);
     }
-    return str;
+    return STRING_TO_JSVAL(str);
 }
 
 // static

data/vendor/tracemonkey/xpconnect/src/xpcthreadcontext.cpp

@@ -120,11 +120,11 @@ static nsIPrincipal*
 GetPrincipalFromCx(JSContext *cx)
 {
     nsIScriptContext* scriptContext = GetScriptContextFromJSContext(cx);
-    if (scriptContext)
+    if(scriptContext)
     {
         nsCOMPtr<nsIScriptObjectPrincipal> globalData =
             do_QueryInterface(scriptContext->GetGlobalObject());
-        if (globalData)
+        if(globalData)
             return globalData->GetPrincipal();
     }
     return nsnull;
@@ -141,19 +141,19 @@ XPCJSContextStack::Push(JSContext * cx)
         XPCJSContextInfo & e = mStack[mStack.Length() - 2];
         if(e.cx)
         {
-            if (e.cx == cx)
+            if(e.cx == cx)
             {
                 nsIScriptSecurityManager* ssm = XPCWrapper::GetSecurityManager();
-                if (ssm)
+                if(ssm)
                 {
                     nsIPrincipal* globalObjectPrincipal =
                         GetPrincipalFromCx(cx);
-                    if (globalObjectPrincipal)
+                    if(globalObjectPrincipal)
                     {
                         nsIPrincipal* subjectPrincipal = ssm->GetCxSubjectPrincipal(cx);
                         PRBool equals = PR_FALSE;
                         globalObjectPrincipal->Equals(subjectPrincipal, &equals);
-                        if (equals)
+                        if(equals)
                         {
                             return NS_OK;
                         }

data/vendor/tracemonkey/xpconnect/src/xpcthrower.cpp

@@ -301,7 +301,7 @@ XPCThrower::ThrowExceptionObject(JSContext* cx, nsIException* e)
     JSBool success = JS_FALSE;
     if(e)
     {
-        nsCOMPtr<nsXPCException> xpcEx;
+        nsCOMPtr<nsIXPCException> xpcEx;
         jsval thrown;
         nsXPConnect* xpc;
 
@@ -310,7 +310,7 @@ XPCThrower::ThrowExceptionObject(JSContext* cx, nsIException* e)
         // context (i.e., not chrome), rethrow the original value.
         if(!IsCallerChrome(cx) &&
            (xpcEx = do_QueryInterface(e)) &&
-           xpcEx->StealThrownJSVal(&thrown))
+           NS_SUCCEEDED(xpcEx->StealJSVal(&thrown)))
         {
             JS_SetPendingException(cx, thrown);
             success = JS_TRUE;
@@ -352,6 +352,7 @@ XPCThrower::ThrowCOMError(JSContext* cx, unsigned long COMErrorCode,
     if(!nsXPCException::NameAndFormatForNSResult(rv, nsnull, &format))
         format = "";
     msg = format;
+#ifndef WINCE
     if(exception)
     {
         msg += static_cast<const char *>
@@ -392,7 +393,13 @@ XPCThrower::ThrowCOMError(JSContext* cx, unsigned long COMErrorCode,
             msg.AppendInt(static_cast<PRUint32>(COMErrorCode), 16);
         }
     }
-    
+
+#else
+    // No error object, so just report the result
+    msg += "COM Error Result = ";
+    msg.AppendInt(static_cast<PRUint32>(COMErrorCode), 16);
+#endif
+
     XPCThrower::BuildAndThrowException(cx, rv, msg.get());
 }
 

data/vendor/tracemonkey/xpconnect/src/xpcvariant.cpp

@@ -172,7 +172,7 @@ private:
     };
 
     // Table has tUnk as a state (column) but not as a type (row).
-    static Type StateTable[tTypeCount][tTypeCount-1];
+    static const Type StateTable[tTypeCount][tTypeCount-1];
 
 public:
     static JSBool GetTypeForArray(XPCCallContext& ccx, JSObject* array, 
@@ -185,7 +185,7 @@ public:
 // Current type is the row along the top. 
 // New state is in the box at the intersection.
 
-XPCArrayHomogenizer::Type 
+const XPCArrayHomogenizer::Type 
 XPCArrayHomogenizer::StateTable[tTypeCount][tTypeCount-1] = {
 /*          tNull,tInt ,tDbl ,tBool,tStr ,tID  ,tArr ,tISup */
 /* tNull */{tNull,tVar ,tVar ,tVar ,tStr ,tID  ,tVar ,tISup },
@@ -392,7 +392,7 @@ JSBool XPCVariant::InitializeData(XPCCallContext& ccx)
 
 // static 
 JSBool 
-XPCVariant::VariantDataToJS(XPCCallContext& ccx, 
+XPCVariant::VariantDataToJS(XPCLazyCallContext& lccx, 
                             nsIVariant* variant,
                             JSObject* scope, nsresult* pErr,
                             jsval* pJSVal)
@@ -447,6 +447,7 @@ XPCVariant::VariantDataToJS(XPCCallContext& ccx,
     xpctvar.flags = 0;
     JSBool success;
 
+    JSContext* cx = lccx.GetJSContext();
     switch(type)
     {
         case nsIDataType::VTYPE_INT8:        
@@ -463,7 +464,7 @@ XPCVariant::VariantDataToJS(XPCCallContext& ccx,
             // Easy. Handle inline.
             if(NS_FAILED(variant->GetAsDouble(&xpctvar.val.d)))
                 return JS_FALSE;
-            return JS_NewNumberValue(ccx, xpctvar.val.d, pJSVal);
+            return JS_NewNumberValue(cx, xpctvar.val.d, pJSVal);
         }
         case nsIDataType::VTYPE_BOOL:        
         {
@@ -626,7 +627,7 @@ XPCVariant::VariantDataToJS(XPCCallContext& ccx,
             }
 
             success = 
-                XPCConvert::NativeArray2JS(ccx, pJSVal, 
+                XPCConvert::NativeArray2JS(lccx, pJSVal, 
                                            (const void**)&du.u.array.mArrayValue,
                                            conversionType, pid,
                                            du.u.array.mArrayCount, 
@@ -638,7 +639,7 @@ VARIANT_DONE:
         }        
         case nsIDataType::VTYPE_EMPTY_ARRAY: 
         {
-            JSObject* array = JS_NewArrayObject(ccx, 0, nsnull);
+            JSObject* array = JS_NewArrayObject(cx, 0, nsnull);
             if(!array) 
                 return JS_FALSE;
             *pJSVal = OBJECT_TO_JSVAL(array);
@@ -660,14 +661,14 @@ VARIANT_DONE:
     if(xpctvar.type.TagPart() == TD_PSTRING_SIZE_IS ||
        xpctvar.type.TagPart() == TD_PWSTRING_SIZE_IS)
     {
-        success = XPCConvert::NativeStringWithSize2JS(ccx, pJSVal,
+        success = XPCConvert::NativeStringWithSize2JS(cx, pJSVal,
                                                       (const void*)&xpctvar.val,
                                                       xpctvar.type,
                                                       size, pErr);
     }
     else
     {
-        success = XPCConvert::NativeData2JS(ccx, pJSVal,
+        success = XPCConvert::NativeData2JS(lccx, pJSVal,
                                             (const void*)&xpctvar.val,
                                             xpctvar.type,
                                             &iid, scope, pErr);

data/vendor/tracemonkey/xpconnect/src/xpcwrappedjs.cpp

@@ -57,17 +57,18 @@ NS_CYCLE_COLLECTION_CLASSNAME(nsXPCWrappedJS)::Traverse
     nsXPCWrappedJS *tmp = Downcast(s);
 
     nsrefcnt refcnt = tmp->mRefCnt.get();
-#ifdef DEBUG_CC
-    char name[72];
-    if (tmp->GetClass())
-      JS_snprintf(name, sizeof(name), "nsXPCWrappedJS (%s)",
-                  tmp->GetClass()->GetInterfaceName());
-    else
-      JS_snprintf(name, sizeof(name), "nsXPCWrappedJS");
-    cb.DescribeNode(RefCounted, refcnt, sizeof(nsXPCWrappedJS), name);
-#else
-    cb.DescribeNode(RefCounted, refcnt);
-#endif
+    if (cb.WantDebugInfo()) {
+        char name[72];
+        if (tmp->GetClass())
+            JS_snprintf(name, sizeof(name), "nsXPCWrappedJS (%s)",
+                        tmp->GetClass()->GetInterfaceName());
+        else
+            JS_snprintf(name, sizeof(name), "nsXPCWrappedJS");
+        cb.DescribeNode(RefCounted, refcnt, sizeof(nsXPCWrappedJS), name);
+    } else {
+        cb.DescribeNode(RefCounted, refcnt, sizeof(nsXPCWrappedJS),
+                        "nsXPCWrappedJS");
+    }
 
     // nsXPCWrappedJS keeps its own refcount artificially at or above 1, see the
     // comment above nsXPCWrappedJS::AddRef.
@@ -619,12 +620,12 @@ nsXPCWrappedJS::GetProperty(const nsAString & name, nsIVariant **_retval)
     if(!ccx.IsValid())
         return NS_ERROR_UNEXPECTED;
 
-    JSString* jsstr = XPCStringConvert::ReadableToJSString(ccx, name);
+    jsval jsstr = XPCStringConvert::ReadableToJSVal(ccx, name);
     if(!jsstr)
         return NS_ERROR_OUT_OF_MEMORY;
 
     return nsXPCWrappedJSClass::
-        GetNamedPropertyAsVariant(ccx, mJSObj, STRING_TO_JSVAL(jsstr), _retval);
+        GetNamedPropertyAsVariant(ccx, mJSObj, jsstr, _retval);
 }
 
 /***************************************************************************/
@@ -647,7 +648,7 @@ nsXPCWrappedJS::DebugDump(PRInt16 depth)
         char * iid = GetClass()->GetIID().ToString();
         XPC_LOG_ALWAYS(("IID number is %s", iid ? iid : "invalid"));
         if(iid)
-            PR_Free(iid);
+            NS_Free(iid);
         XPC_LOG_ALWAYS(("nsXPCWrappedJSClass @ %x", mClass));
 
         if(!isRoot)

data/vendor/tracemonkey/xpconnect/src/xpcwrappedjsclass.cpp

@@ -42,8 +42,9 @@
 /* Sharable code and data for wrapper around JSObjects. */
 
 #include "xpcprivate.h"
-#include "XPCWrapper.h"
+#include "nsArrayEnumerator.h"
 #include "nsWrapperCache.h"
+#include "XPCWrapper.h"
 
 NS_IMPL_THREADSAFE_ISUPPORTS1(nsXPCWrappedJSClass, nsIXPCWrappedJSClass)
 
@@ -247,6 +248,29 @@ nsXPCWrappedJSClass::CallQueryInterfaceOnJSObject(XPCCallContext& ccx,
     jsid funid;
     jsval fun;
 
+    // Don't call the actual function on a content object. We'll determine
+    // whether or not a content object is capable of implementing the
+    // interface (i.e. whether the interface is scriptable) and most content
+    // objects don't have QI implementations anyway. Also see bug 503926.
+    if(XPCPerThreadData::IsMainThread(ccx) &&
+       !JS_GetGlobalForObject(ccx, jsobj)->isSystem())
+    {
+        nsCOMPtr<nsIPrincipal> objprin;
+        nsIScriptSecurityManager *ssm = XPCWrapper::GetSecurityManager();
+        if(ssm)
+        {
+            nsresult rv = ssm->GetObjectPrincipal(ccx, jsobj, getter_AddRefs(objprin));
+            NS_ENSURE_SUCCESS(rv, nsnull);
+
+            PRBool isSystem;
+            rv = ssm->IsSystemPrincipal(objprin, &isSystem);
+            NS_ENSURE_SUCCESS(rv, nsnull);
+
+            if(!isSystem)
+                return nsnull;
+        }
+    }
+
     // check upfront for the existence of the function property
     funid = mRuntime->GetStringID(XPCJSRuntime::IDX_QUERY_INTERFACE);
     if(!JS_GetPropertyById(cx, jsobj, funid, &fun) || JSVAL_IS_PRIMITIVE(fun))
@@ -403,7 +427,6 @@ nsXPCWrappedJSClass::BuildPropertyEnumerator(XPCCallContext& ccx,
     JSContext* cx = ccx.GetJSContext();
     nsresult retval = NS_ERROR_FAILURE;
     JSIdArray* idArray = nsnull;
-    xpcPropertyBagEnumerator* enumerator = nsnull;
     int i;
 
     // Saved state must be restored, all exits through 'out'...
@@ -412,13 +435,9 @@ nsXPCWrappedJSClass::BuildPropertyEnumerator(XPCCallContext& ccx,
 
     idArray = JS_Enumerate(cx, aJSObj);
     if(!idArray)
-        goto out;
+        return retval;
     
-    enumerator = new xpcPropertyBagEnumerator(idArray->length);
-    if(!enumerator)
-        goto out;
-    NS_ADDREF(enumerator);
-        
+    nsCOMArray<nsIProperty> propertyArray(idArray->length);
     for(i = 0; i < idArray->length; i++)
     {
         nsCOMPtr<nsIVariant> value;
@@ -448,17 +467,14 @@ nsXPCWrappedJSClass::BuildPropertyEnumerator(XPCCallContext& ccx,
         if(!property)
             goto out;
 
-        if(!enumerator->AppendElement(property))
+        if(!propertyArray.AppendObject(property))
             goto out;
     }
 
-    NS_ADDREF(*aEnumerate = enumerator);
-    retval = NS_OK;
+    retval = NS_NewArrayEnumerator(aEnumerate, propertyArray);
 
 out:
-    NS_IF_RELEASE(enumerator);
-    if(idArray)
-        JS_DestroyIdArray(cx, idArray);
+    JS_DestroyIdArray(cx, idArray);
 
     return retval;
 }
@@ -487,44 +503,6 @@ NS_IMETHODIMP xpcProperty::GetValue(nsIVariant * *aValue)
     return NS_OK;
 }
 
-/***************************************************************************/
-
-NS_IMPL_ISUPPORTS1(xpcPropertyBagEnumerator, nsISimpleEnumerator)
-
-xpcPropertyBagEnumerator::xpcPropertyBagEnumerator(PRUint32 count)
-    : mIndex(0), mCount(0)
-{
-    mArray.SizeTo(count);
-}
-
-JSBool xpcPropertyBagEnumerator::AppendElement(nsISupports* element)
-{
-    if(!mArray.AppendElement(element))
-        return JS_FALSE;
-    mCount++;
-    return JS_TRUE;
-}
-
-/* boolean hasMoreElements (); */
-NS_IMETHODIMP xpcPropertyBagEnumerator::HasMoreElements(PRBool *_retval)
-{
-    *_retval = mIndex < mCount;
-    return NS_OK;
-}
-
-/* nsISupports getNext (); */
-NS_IMETHODIMP xpcPropertyBagEnumerator::GetNext(nsISupports **_retval)
-{
-    if(!(mIndex < mCount))
-    {
-        NS_ERROR("Bad nsISimpleEnumerator caller!");
-        return NS_ERROR_FAILURE;    
-    }
-    
-    *_retval = mArray.ElementAt(mIndex++);
-    return *_retval ? NS_OK : NS_ERROR_FAILURE;
-}
-
 /***************************************************************************/
 // This 'WrappedJSIdentity' class and singleton allow us to figure out if
 // any given nsISupports* is implemented by a WrappedJS object. This is done
@@ -1289,7 +1267,6 @@ nsXPCWrappedJSClass::CallMethod(nsXPCWrappedJS* wrapper, uint16 methodIndex,
     JSBool success;
     JSBool readyToDoTheCall = JS_FALSE;
     nsID  param_iid;
-    uint8 outConversionFailedIndex;
     JSObject* obj;
     const char* name = info->name;
     jsval fval;
@@ -1298,6 +1275,8 @@ nsXPCWrappedJSClass::CallMethod(nsXPCWrappedJS* wrapper, uint16 methodIndex,
     XPCContext* xpcc;
     JSContext* cx;
     JSObject* thisObj;
+    JSBool popPrincipal = JS_FALSE;
+    nsIScriptSecurityManager_1_9_2* ssm = nsnull;
 
     // Make sure not to set the callee on ccx until after we've gone through
     // the whole nsIXPCFunctionThisTranslator bit.  That code uses ccx to
@@ -1480,10 +1459,39 @@ nsXPCWrappedJSClass::CallMethod(nsXPCWrappedJS* wrapper, uint16 methodIndex,
         *sp++ = OBJECT_TO_JSVAL(thisObj);
     }
 
-    // make certain we leave no garbage in the stack
-    for(i = 0; i < argc; i++)
+    // Figure out what our callee is
+    if(XPT_MD_IS_GETTER(info->flags) || XPT_MD_IS_SETTER(info->flags))
+    {
+        // Pull the getter or setter off of |obj|
+        uintN attrs;
+        JSBool found;
+        JSPropertyOp getter;
+        JSPropertyOp setter;
+        if(!JS_GetPropertyAttrsGetterAndSetter(cx, obj, name,
+                                               &attrs, &found,
+                                               &getter, &setter))
+        {
+            // XXX Do we want to report this exception?
+            JS_ClearPendingException(cx);
+            goto pre_call_clean_up;
+        }
+
+        if(XPT_MD_IS_GETTER(info->flags) && (attrs & JSPROP_GETTER))
+        {
+            // JSPROP_GETTER means the getter is actually a
+            // function object.
+            ccx.SetCallee(JS_FUNC_TO_DATA_PTR(JSObject*, getter));
+        }
+        else if(XPT_MD_IS_SETTER(info->flags) && (attrs & JSPROP_SETTER))
+        {
+            // JSPROP_SETTER means the setter is actually a
+            // function object.
+            ccx.SetCallee(JS_FUNC_TO_DATA_PTR(JSObject*, setter));
+        }
+    }
+    else if(JSVAL_IS_OBJECT(fval))
     {
-        sp[i] = JSVAL_VOID;
+        ccx.SetCallee(JSVAL_TO_OBJECT(fval));
     }
 
     // build the args
@@ -1541,43 +1549,11 @@ nsXPCWrappedJSClass::CallMethod(nsXPCWrappedJS* wrapper, uint16 methodIndex,
                     goto pre_call_clean_up;
             }
 
-            // Figure out what our callee is
-            if(XPT_MD_IS_GETTER(info->flags) || XPT_MD_IS_SETTER(info->flags))
-            {
-                // Pull the getter or setter off of |obj|
-                uintN attrs;
-                JSBool found;
-                JSPropertyOp getter;
-                JSPropertyOp setter;
-                JSBool ok =
-                    JS_GetPropertyAttrsGetterAndSetter(cx, obj, name,
-                                                       &attrs, &found,
-                                                       &getter, &setter);
-                if(ok)
-                {
-                    if(XPT_MD_IS_GETTER(info->flags) && (attrs & JSPROP_GETTER))
-                    {
-                        // JSPROP_GETTER means the getter is actually a
-                        // function object.
-                        ccx.SetCallee(JS_FUNC_TO_DATA_PTR(JSObject*, getter));
-                    }
-                    else if(XPT_MD_IS_SETTER(info->flags) && (attrs & JSPROP_SETTER))
-                    {
-                        // JSPROP_SETTER means the setter is actually a
-                        // function object.
-                        ccx.SetCallee(JS_FUNC_TO_DATA_PTR(JSObject*, setter));
-                    }
-                }
-            }
-            else if(JSVAL_IS_OBJECT(fval))
-            {
-                ccx.SetCallee(JSVAL_TO_OBJECT(fval));
-            }
-
             if(isArray)
             {
-
-                if(!XPCConvert::NativeArray2JS(ccx, &val, (const void**)&pv->val,
+                XPCLazyCallContext lccx(ccx);
+                if(!XPCConvert::NativeArray2JS(lccx, &val,
+                                               (const void**)&pv->val,
                                                datum_type, &param_iid,
                                                array_count, obj, nsnull))
                     goto pre_call_clean_up;
@@ -1623,8 +1599,6 @@ nsXPCWrappedJSClass::CallMethod(nsXPCWrappedJS* wrapper, uint16 methodIndex,
             *sp++ = val;
     }
 
-
-
     readyToDoTheCall = JS_TRUE;
 
 pre_call_clean_up:
@@ -1686,6 +1660,31 @@ pre_call_clean_up:
 
     JS_ClearPendingException(cx);
 
+    if(XPCPerThreadData::IsMainThread(ccx))
+    {
+        ssm = XPCWrapper::GetSecurityManager();
+        if(ssm)
+        {
+            nsCOMPtr<nsIPrincipal> objPrincipal;
+            ssm->GetObjectPrincipal(ccx, obj, getter_AddRefs(objPrincipal));
+            if(objPrincipal)
+            {
+                JSStackFrame* fp = nsnull;
+                nsresult rv =
+                    ssm->PushContextPrincipal(ccx, JS_FrameIterator(ccx, &fp),
+                                              objPrincipal);
+                if(NS_FAILED(rv))
+                {
+                    JS_ReportOutOfMemory(ccx);
+                    retval = NS_ERROR_OUT_OF_MEMORY;
+                    goto done;
+                }
+
+                popPrincipal = JS_TRUE;
+            }
+        }
+    }
+
     if(XPT_MD_IS_GETTER(info->flags))
         success = JS_GetProperty(cx, obj, name, &result);
     else if(XPT_MD_IS_SETTER(info->flags))
@@ -1722,7 +1721,10 @@ pre_call_clean_up:
         }
     }
 
-    if (!success)
+    if(popPrincipal)
+        ssm->PopContextPrincipal(ccx);
+
+    if(!success)
     {
         PRBool forceReport;
         if(NS_FAILED(mInfo->IsFunction(&forceReport)))
@@ -1737,9 +1739,6 @@ pre_call_clean_up:
 
     ccx.GetThreadData()->SetException(nsnull); // XXX necessary?
 
-#define HANDLE_OUT_CONVERSION_FAILURE       \
-        {outConversionFailedIndex = i; break;}
-
     // convert out args and result
     // NOTE: this is the total number of native params, not just the args
     // Convert independent params only.
@@ -1747,7 +1746,6 @@ pre_call_clean_up:
     // the params upon which they depend will have already been converted -
     // regardless of ordering.
 
-    outConversionFailedIndex = paramCount;
     foundDependentParam = JS_FALSE;
     for(i = 0; i < paramCount; i++)
     {
@@ -1778,7 +1776,7 @@ pre_call_clean_up:
                 !JS_GetPropertyById(cx, JSVAL_TO_OBJECT(stackbase[i+2]),
                     mRuntime->GetStringID(XPCJSRuntime::IDX_VALUE),
                     &val))
-            HANDLE_OUT_CONVERSION_FAILURE
+            break;
 
         // setup allocator and/or iid
 
@@ -1787,18 +1785,18 @@ pre_call_clean_up:
             if(NS_FAILED(GetInterfaceInfo()->
                             GetIIDForParamNoAlloc(methodIndex, &param,
                                                   &param_iid)))
-                HANDLE_OUT_CONVERSION_FAILURE
+                break;
         }
         else if(type.IsPointer() && !param.IsShared() && !param.IsDipper())
             useAllocator = JS_TRUE;
 
         if(!XPCConvert::JSData2Native(ccx, &pv->val, val, type,
                                       useAllocator, &param_iid, nsnull))
-            HANDLE_OUT_CONVERSION_FAILURE
+            break;
     }
 
     // if any params were dependent, then we must iterate again to convert them.
-    if(foundDependentParam && outConversionFailedIndex == paramCount)
+    if(foundDependentParam && i == paramCount)
     {
         for(i = 0; i < paramCount; i++)
         {
@@ -1828,7 +1826,7 @@ pre_call_clean_up:
             else if(!JS_GetPropertyById(cx, JSVAL_TO_OBJECT(stackbase[i+2]),
                         mRuntime->GetStringID(XPCJSRuntime::IDX_VALUE),
                         &val))
-                HANDLE_OUT_CONVERSION_FAILURE
+                break;
 
             // setup allocator and/or iid
 
@@ -1836,7 +1834,7 @@ pre_call_clean_up:
             {
                 if(NS_FAILED(mInfo->GetTypeForParam(methodIndex, &param, 1,
                                                     &datum_type)))
-                    HANDLE_OUT_CONVERSION_FAILURE
+                    break;
             }
             else
                 datum_type = type;
@@ -1846,7 +1844,7 @@ pre_call_clean_up:
                if(!GetInterfaceTypeFromParam(cx, info, param, methodIndex,
                                              datum_type, nativeParams,
                                              &param_iid))
-                    HANDLE_OUT_CONVERSION_FAILURE
+                   break;
             }
             else if(type.IsPointer() && !param.IsShared())
                 useAllocator = JS_TRUE;
@@ -1856,7 +1854,7 @@ pre_call_clean_up:
                 if(!GetArraySizeFromParam(cx, info, param, methodIndex,
                                           i, GET_LENGTH, nativeParams,
                                           &array_count))
-                    HANDLE_OUT_CONVERSION_FAILURE
+                    break;
             }
 
             if(isArray)
@@ -1867,7 +1865,7 @@ pre_call_clean_up:
                                                datum_type,
                                                useAllocator, &param_iid,
                                                nsnull))
-                    HANDLE_OUT_CONVERSION_FAILURE
+                    break;
             }
             else if(isSizedString)
             {
@@ -1876,19 +1874,19 @@ pre_call_clean_up:
                                                    array_count, array_count,
                                                    datum_type, useAllocator,
                                                    nsnull))
-                    HANDLE_OUT_CONVERSION_FAILURE
+                    break;
             }
             else
             {
                 if(!XPCConvert::JSData2Native(ccx, &pv->val, val, type,
                                               useAllocator, &param_iid,
                                               nsnull))
-                    HANDLE_OUT_CONVERSION_FAILURE
+                    break;
             }
         }
     }
 
-    if(outConversionFailedIndex != paramCount)
+    if(i != paramCount)
     {
         // We didn't manage all the result conversions!
         // We have to cleanup any junk that *did* get converted.
@@ -1979,7 +1977,7 @@ nsXPCWrappedJSClass::DebugDump(PRInt16 depth)
         char * iid = mIID.ToString();
         XPC_LOG_ALWAYS(("IID number is %s", iid ? iid : "invalid"));
         if(iid)
-            PR_Free(iid);
+            NS_Free(iid);
         XPC_LOG_ALWAYS(("InterfaceInfo @ %x", mInfo));
         uint16 methodCount = 0;
         if(depth)