Backed out changeset e13f3b909fa2
authorSteve Fink <sfink@mozilla.com>
Mon, 24 Jan 2011 15:12:18 -0800
changeset 61247 bee0e6e72ca50dedbe19f284e8149fb03f2f2d42
parent 61246 77f9d80847c7f44470d80de6d5d6dbc83bb4f4ea
child 61248 4f9f2c9f1e64c1eccb7962a307fdd9ca4f8f70c2
push id18277
push usercleary@mozilla.com
push dateTue, 25 Jan 2011 03:52:51 +0000
treeherdermozilla-central@7ee91bd90e7a [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
milestone2.0b10pre
backs oute13f3b909fa222ad57ae6f3c7e7b5e1785ea1674
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
Backed out changeset e13f3b909fa2
js/src/xpconnect/src/xpcwrappedjsclass.cpp
--- a/js/src/xpconnect/src/xpcwrappedjsclass.cpp
+++ b/js/src/xpconnect/src/xpcwrappedjsclass.cpp
@@ -1300,24 +1300,23 @@ nsXPCWrappedJSClass::CallMethod(nsXPCWra
         cx = ccx.GetJSContext();
     }
     else
     {
         xpcc = nsnull;
         cx = nsnull;
     }
 
+    AutoScriptEvaluate scriptEval(cx);
     js::AutoValueVector args(cx);
-    /* This must come before AutoScriptEvaluate */
-    JSAutoEnterCompartment ac;
-    AutoScriptEvaluate scriptEval(cx);
     ContextPrincipalGuard principalGuard(ccx);
 
     obj = thisObj = wrapper->GetJSObject();
 
+    JSAutoEnterCompartment ac;
     if (!ac.enter(ccx, obj))
         goto pre_call_clean_up;
 
     // XXX ASSUMES that retval is last arg. The xpidl compiler ensures this.
     paramCount = info->num_args;
     argc = paramCount -
         (paramCount && XPT_PD_IS_RETVAL(info->params[paramCount-1].flags) ? 1 : 0);