Bug 1436865 - Remove nsIDOMCrypto. r=bz

MozReview-Commit-ID: 4bQVSF94bbz

--HG--
extra : rebase_source : 6386e08c4a392b75473c47997e6cf01d35be78e2

dom/base/Crypto.cpp

@@ -22,7 +22,6 @@ namespace dom {
 NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(Crypto)
   NS_WRAPPERCACHE_INTERFACE_MAP_ENTRY
   NS_INTERFACE_MAP_ENTRY(nsISupports)
-  NS_INTERFACE_MAP_ENTRY(nsIDOMCrypto)
 NS_INTERFACE_MAP_END
 
 NS_IMPL_CYCLE_COLLECTING_ADDREF(Crypto)
@@ -30,7 +29,8 @@ NS_IMPL_CYCLE_COLLECTING_RELEASE(Crypto)
 
 NS_IMPL_CYCLE_COLLECTION_WRAPPERCACHE(Crypto, mParent, mSubtle)
 
-Crypto::Crypto()
+Crypto::Crypto(nsIGlobalObject* aParent)
+  : mParent(aParent)
 {
 }
 
@@ -38,13 +38,6 @@ Crypto::~Crypto()
 {
 }
 
-void
-Crypto::Init(nsIGlobalObject* aParent)
-{
-  mParent = do_QueryInterface(aParent);
-  MOZ_ASSERT(mParent);
-}
-
 /* virtual */ JSObject*
 Crypto::WrapObject(JSContext* aCx, JS::Handle<JSObject*> aGivenProto)
 {

dom/base/Crypto.h

@@ -6,14 +6,11 @@
 #ifndef mozilla_dom_Crypto_h
 #define mozilla_dom_Crypto_h
 
-#include "nsIDOMCrypto.h"
 #include "mozilla/dom/SubtleCrypto.h"
 #include "nsIGlobalObject.h"
 
 #include "nsWrapperCache.h"
 #include "mozilla/dom/TypedArray.h"
-#define NS_DOMCRYPTO_CID \
-  {0x929d9320, 0x251e, 0x11d4, { 0x8a, 0x7c, 0x00, 0x60, 0x08, 0xc8, 0x44, 0xc3} }
 
 namespace mozilla {
 
@@ -21,16 +18,14 @@ class ErrorResult;
 
 namespace dom {
 
-class Crypto : public nsIDOMCrypto,
-               public nsWrapperCache
+class Crypto final : public nsISupports,
+                     public nsWrapperCache
 {
 protected:
   virtual ~Crypto();
 
 public:
-  Crypto();
-
-  NS_DECL_NSIDOMCRYPTO
+  explicit Crypto(nsIGlobalObject* aParent);
 
   NS_DECL_CYCLE_COLLECTING_ISUPPORTS
   NS_DECL_CYCLE_COLLECTION_SCRIPT_HOLDER_CLASS(Crypto)
@@ -43,8 +38,6 @@ public:
   SubtleCrypto*
   Subtle();
 
-  // WebIDL
-
   nsIGlobalObject*
   GetParentObject() const
   {

dom/base/nsGlobalWindowInner.cpp

@@ -3033,8 +3033,7 @@ Crypto*
 nsGlobalWindowInner::GetCrypto(ErrorResult& aError)
 {
   if (!mCrypto) {
-    mCrypto = new Crypto();
-    mCrypto->Init(this);
+    mCrypto = new Crypto(this);
   }
   return mCrypto;
 }

dom/bindings/Bindings.conf

@@ -1712,8 +1712,6 @@ addExternalIface('MozTreeView', nativeType='nsITreeView',
 addExternalIface('MozWakeLockListener', headerFile='nsIDOMWakeLockListener.h')
 addExternalIface('nsIBrowserDOMWindow', nativeType='nsIBrowserDOMWindow',
                  notflattened=True)
-addExternalIface('nsIDOMCrypto', nativeType='nsIDOMCrypto',
-                 headerFile='Crypto.h')
 addExternalIface('nsIFile', nativeType='nsIFile', notflattened=True)
 addExternalIface('nsILoadGroup', nativeType='nsILoadGroup',
                  headerFile='nsILoadGroup.h', notflattened=True)

dom/interfaces/base/domstubs.idl

@@ -55,6 +55,3 @@ interface nsIDOMHTMLHeadElement;
 
 // Range
 interface nsIDOMRange;
-
-// Crypto
-interface nsIDOMCrypto;

dom/interfaces/base/moz.build

@@ -19,7 +19,6 @@ XPIDL_SOURCES += [
     'nsIDOMClientRect.idl',
     'nsIDOMClientRectList.idl',
     'nsIDOMConstructor.idl',
-    'nsIDOMCrypto.idl',
     'nsIDOMGlobalPropertyInitializer.idl',
     'nsIDOMHistory.idl',
     'nsIDOMModalContentWindow.idl',

dom/interfaces/base/nsIDOMCrypto.idl

@@ -1,14 +0,0 @@
-/* -*- Mode: IDL; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-#include "nsISupports.idl"
-
-interface nsIGlobalObject;
-
-[uuid(48d7f7fd-bb85-4c04-9b8b-5cd9131acdef)]
-interface nsIDOMCrypto : nsISupports
-{
-  [notxpcom] void init(in nsIGlobalObject parent);
-};

dom/webidl/Window.webidl

@@ -23,7 +23,6 @@ interface ApplicationCache;
 interface IID;
 interface nsIBrowserDOMWindow;
 interface nsIMessageBroadcaster;
-interface nsIDOMCrypto;
 interface XULControllers;
 
 // http://www.whatwg.org/specs/web-apps/current-work/

dom/workers/WorkerScope.cpp

@@ -160,8 +160,7 @@ WorkerGlobalScope::GetCrypto(ErrorResult& aError)
   mWorkerPrivate->AssertIsOnWorkerThread();
 
   if (!mCrypto) {
-    mCrypto = new Crypto();
-    mCrypto->Init(this);
+    mCrypto = new Crypto(this);
   }
 
   return mCrypto;

js/xpconnect/src/Sandbox.cpp

@@ -234,8 +234,7 @@ SandboxCreateCrypto(JSContext* cx, JS::HandleObject obj)
     nsIGlobalObject* native = xpc::NativeGlobal(obj);
     MOZ_ASSERT(native);
 
-    dom::Crypto* crypto = new dom::Crypto();
-    crypto->Init(native);
+    dom::Crypto* crypto = new dom::Crypto(native);
     JS::RootedObject wrapped(cx, crypto->WrapObject(cx, nullptr));
     return JS_DefineProperty(cx, obj, "crypto", wrapped, JSPROP_ENUMERATE);
 }