Remove hunk that was mis-merged
authorBoris Zbarsky <bzbarsky@mit.edu>
Wed, 08 Feb 2012 01:00:43 -0500
changeset 86458 fcf6c993a8a568640df3a452d02675b32413c59b
parent 86457 8f12170e8f206796778237432b641907610e95a4
child 86459 64089ddcb92dbbb546086e52f23fa5e8fbf5baad
push id95
push userbzbarsky@mozilla.com
push dateWed, 08 Feb 2012 06:00:50 +0000
milestone13.0a1
Remove hunk that was mis-merged
js/xpconnect/src/nsXPConnect.cpp
--- a/js/xpconnect/src/nsXPConnect.cpp
+++ b/js/xpconnect/src/nsXPConnect.cpp
@@ -1246,20 +1246,16 @@ xpc_CreateGlobalObject(JSContext *cx, JS
 
     if (clasp->flags & JSCLASS_DOM_GLOBAL) {
         mozilla::dom::bindings::AllocateProtoCache(*global);
     }
 
     return NS_OK;
 }
 
-    }
-
-    if (clasp->flags & JSCLASS_DOM_GLOBAL) {
-        mozilla::dom::bindings::AllocateProtoCache(*global);
 NS_IMETHODIMP
 nsXPConnect::InitClassesWithNewWrappedGlobal(JSContext * aJSContext,
                                              nsISupports *aCOMObj,
                                              const nsIID & aIID,
                                              nsIPrincipal * aPrincipal,
                                              nsISupports * aExtraPtr,
                                              PRUint32 aFlags,
                                              nsIXPConnectJSObjectHolder **_retval)