Backed out changeset c41b9f3a9d83 - bug 487980 due to backing out 326628, due to regression bug 494899

dom/base/nsGlobalWindow.cpp

@@ -346,6 +346,7 @@ static NS_DEFINE_CID(kXULControllersCID, NS_XULCONTROLLERS_CID);
 static const char sJSStackContractID[] = "@mozilla.org/js/xpc/ContextStack;1";
 
 static const char kCryptoContractID[] = NS_CRYPTO_CONTRACTID;
+static const char kPkcs11ContractID[] = NS_PKCS11_CONTRACTID;
 
 static PRBool
 IsAboutBlank(nsIURI* aURI)
@@ -2930,6 +2931,13 @@ nsGlobalWindow::GetCrypto(nsIDOMCrypto** aCrypto)
   return NS_OK;
 }
 
+NS_IMETHODIMP
+nsGlobalWindow::GetPkcs11(nsIDOMPkcs11** aPkcs11)
+{
+  *aPkcs11 = nsnull;
+  return NS_OK;
+}
+
 NS_IMETHODIMP
 nsGlobalWindow::GetControllers(nsIControllers** aResult)
 {

dom/interfaces/base/domstubs.idl

@@ -126,4 +126,5 @@ interface nsIDOMRange;
 // Crypto
 interface nsIDOMCRMFObject;
 interface nsIDOMCrypto;
+interface nsIDOMPkcs11;
 

dom/interfaces/base/nsIDOMWindowInternal.idl

@@ -44,7 +44,7 @@ interface nsIControllers;
 interface nsIDOMLocation;
 interface nsIVariant;
 
-[scriptable, uuid(5c5ece60-d5f1-47fa-9afa-ee3b9c76b0e5)]
+[scriptable, uuid(3414EBC7-731F-4697-9F43-ACA6F5050875)]
 interface nsIDOMWindowInternal : nsIDOMWindow2
 {
   readonly attribute nsIDOMWindowInternal        window;
@@ -81,6 +81,7 @@ interface nsIDOMWindowInternal : nsIDOMWindow2
   readonly attribute nsIDOMBarProp               directories;
   readonly attribute boolean                     closed;
   readonly attribute nsIDOMCrypto                crypto;
+  readonly attribute nsIDOMPkcs11                pkcs11;
 
   // XXX Shouldn't this be in nsIDOMChromeWindow?
   /* [replaceable] controllers */