mozilla-beta: changeset 53358:688ca6c81137c6972b5a7f172394c7b4d332e93d

author	David Mandelin <dmandelin@mozilla.com>
	Mon, 09 Aug 2010 18:29:34 -0700
changeset 53358	688ca6c81137c6972b5a7f172394c7b4d332e93d
parent 53357	167dfe95695e9535eec893e58426530613f365b8
child 53359	4546e4c7427c70da01c007324a779cdce8a37da6
push id	1
push user	root
push date	Tue, 26 Apr 2011 22:38:44 +0000
treeherder	mozilla-beta@bfdb6e623a36 [default view] [failures only]
perfherder	[talos] [build metrics] [platform microbench] (compared to previous push)
bugs	585801
milestone	2.0b4pre
first release with	nightly linux32 cd3c926a7413 / 4.0b6pre / 20100912030102 / files nightly linux64 cd3c926a7413 / 4.0b6pre / 20100912030140 / files nightly mac cd3c926a7413 / 4.0b6pre / 20100912030939 / files nightly win32 cd3c926a7413 / 4.0b6pre / 20100912041924 / files nightly win64 6dfa6a7c94e0 / 4.0b7pre / 20100915014851 / files
last release without	nightly linux32 a0ea32596abd / 4.0b4pre / 20100808025720 / files nightly linux64 a0ea32596abd / 4.0b4pre / 20100808030703 / files nightly mac a0ea32596abd / 4.0b4pre / 20100808031314 / files nightly win32 a0ea32596abd / 4.0b4pre / 20100808040523 / files nightly win64 a0ea32596abd / 4.0b4pre / 20100808025040 / files

--- a/modules/plugin/base/src/nsNPAPIPlugin.cpp
+++ b/modules/plugin/base/src/nsNPAPIPlugin.cpp
@@ -1567,16 +1567,18 @@ bool NP_CALLBACK
 
   JSObject *obj =
     nsNPObjWrapper::GetNewOrUsed(npp, cx, npobj);
 
   if (!obj) {
     return false;
   }
 
+  OBJ_TO_INNER_OBJECT(cx, obj);
+
   // Root obj and the rval (below).
   jsval vec[] = { OBJECT_TO_JSVAL(obj), JSVAL_NULL };
   js::AutoArrayRooter tvr(cx, NS_ARRAY_LENGTH(vec), vec);
   jsval *rval = &vec[1];
 
   if (result) {
     // Initialize the out param to void
     VOID_TO_NPVARIANT(*result);