Bug 959787 - Handlify JS_ExecuteScript and JS::Evaluate APIs r=terrence r=bz

2014-04-01 11:34:39 +01:00
parent fc521b1eb6
commit 7664170728
32 changed files with 231 additions and 112 deletions
--- a/dom/plugins/base/nsNPAPIPlugin.cpp
+++ b/dom/plugins/base/nsNPAPIPlugin.cpp
@@ -1558,7 +1558,7 @@ _evaluate(NPP npp, NPObject* npobj, NPString *script, NPVariant *result)
  JS::Rooted<JS::Value> rval(cx);
  nsJSUtils::EvaluateOptions evalOptions;
  nsresult rv = nsJSUtils::EvaluateString(cx, utf16script, obj, options,
-                                          evalOptions, rval.address());
+                                          evalOptions, &rval);

  return NS_SUCCEEDED(rv) &&
         (!result || JSValToNPVariant(npp, cx, rval, result));