Bug 985472 - Name fixup in ExportFunction. r=bholley, a=lsblakk
authorGabor Krizsanits <gkrizsanits@mozilla.com>
Tue, 25 Mar 2014 16:21:51 +0100
changeset 192192 b955f950df88
parent 192191 8c9e76ede410
child 192193 4c244576343b
push id3519
push userryanvm@gmail.com
push date2014-05-05 16:58 +0000
Treeherderresults
reviewersbholley, lsblakk
bugs985472
milestone30.0
Bug 985472 - Name fixup in ExportFunction. r=bholley, a=lsblakk
js/xpconnect/src/XPCComponents.cpp
js/xpconnect/src/xpcprivate.h
--- a/js/xpconnect/src/XPCComponents.cpp
+++ b/js/xpconnect/src/XPCComponents.cpp
@@ -3003,17 +3003,17 @@ nsXPCComponents_Utils::EvalInWindow(cons
         return NS_ERROR_INVALID_ARG;
 
     RootedObject rwindow(cx, &window.toObject());
     if (!xpc::EvalInWindow(cx, source, rwindow, rval))
         return NS_ERROR_FAILURE;
     return NS_OK;
 }
 
-/* jsval exportFunction(in jsval vfunction, in jsval vscope, in jsval vname); */
+/* jsval exportFunction(in jsval vfunction, in jsval vscope, in jsval voptions); */
 NS_IMETHODIMP
 nsXPCComponents_Utils::ExportFunction(HandleValue vfunction, HandleValue vscope,
                                       HandleValue voptions, JSContext *cx,
                                       MutableHandleValue rval)
 {
     if (!xpc::ExportFunction(cx, vfunction, vscope, voptions, rval))
         return NS_ERROR_FAILURE;
     return NS_OK;
--- a/js/xpconnect/src/xpcprivate.h
+++ b/js/xpconnect/src/xpcprivate.h
@@ -3431,17 +3431,17 @@ CreateObjectIn(JSContext *cx, JS::Handle
                JS::MutableHandleValue rval);
 
 bool
 EvalInWindow(JSContext *cx, const nsAString &source, JS::HandleObject scope,
              JS::MutableHandleValue rval);
 
 bool
 ExportFunction(JSContext *cx, JS::HandleValue vscope, JS::HandleValue vfunction,
-               JS::HandleValue vname, JS::MutableHandleValue rval);
+               JS::HandleValue voptions, JS::MutableHandleValue rval);
 
 } /* namespace xpc */
 
 
 /***************************************************************************/
 // Inlined utilities.
 
 inline bool