Merge mozilla-central and mozilla-inbound
authorEhsan Akhgari <ehsan@mozilla.com>
Sun, 07 Aug 2011 00:45:59 -0400
changeset 73974 4c89811f38ce3fc1fe1f64c39ac9eedb29bb30f3
parent 73973 9df2094c115ff39d6033418c6facab48e1371d06 (current diff)
parent 73942 9f943b1faf6e320214b449f681293707416c4507 (diff)
child 73975 f7dc94e1b75cb1a755a4872176602433bb33c2ba
push id2
push userbsmedberg@mozilla.com
push dateFri, 19 Aug 2011 14:38:13 +0000
milestone8.0a1
Merge mozilla-central and mozilla-inbound
js/src/xpconnect/src/xpcjsruntime.cpp
--- a/js/src/xpconnect/src/xpcjsruntime.cpp
+++ b/js/src/xpconnect/src/xpcjsruntime.cpp
@@ -914,17 +914,17 @@ JSBool XPCJSRuntime::GCCallback(JSContex
             break;
         }
         case JSGC_END:
         {
             // NOTE that this event happens outside of the gc lock in
             // the js engine. So this could be simultaneous with the
             // events above.
 
-            // Do any deferred released of native objects.
+            // Do any deferred releases of native objects.
 #ifdef XPC_TRACK_DEFERRED_RELEASES
             printf("XPC - Begin deferred Release of %d nsISupports pointers\n",
                    self->mNativesToReleaseArray.Length());
 #endif
             DoDeferredRelease(self->mNativesToReleaseArray);
 #ifdef XPC_TRACK_DEFERRED_RELEASES
             printf("XPC - End deferred Releases\n");
 #endif