Backed out changeset 3b73e9c7a5d0 for orange

2013-05-14 01:00:11 -07:00
parent d43213e6a5
commit c9e89d461d
5 changed files with 15 additions and 23 deletions
--- a/dom/plugins/base/nsNPAPIPlugin.cpp
+++ b/dom/plugins/base/nsNPAPIPlugin.cpp
@@ -1211,8 +1211,7 @@ _getwindowobject(NPP npp)
  // Using ::JS_GetGlobalObject(cx) is ok here since the window we
  // want to return here is the outer window, *not* the inner (since
  // we don't know what the plugin will do with it).
-  JS::Rooted<JSObject*> global(cx, ::JS_GetGlobalObject(cx));
-  return nsJSObjWrapper::GetNewOrUsed(npp, cx, global);
+  return nsJSObjWrapper::GetNewOrUsed(npp, cx, ::JS_GetGlobalObject(cx));
 }

 NPObject* NP_CALLBACK