From 4a08595eeb3e1aad882bc1cf98973973979bfd99 Mon Sep 17 00:00:00 2001 From: Matthew Noorenberghe Date: Tue, 9 Jul 2013 18:15:34 -0700 Subject: [PATCH] Bug 888584 - Lazily load IdentityUtils.jsm. r=khuey --- b2g/components/SignInToWebsite.jsm | 4 +++- dom/identity/DOMIdentity.jsm | 4 +++- dom/identity/nsDOMIdentity.js | 8 +++++++- toolkit/identity/MinimalIdentity.jsm | 4 +++- toolkit/identity/RelyingParty.jsm | 4 +++- 5 files changed, 19 insertions(+), 5 deletions(-) diff --git a/b2g/components/SignInToWebsite.jsm b/b2g/components/SignInToWebsite.jsm index 3b14860fc9f6..21faf91a4d12 100644 --- a/b2g/components/SignInToWebsite.jsm +++ b/b2g/components/SignInToWebsite.jsm @@ -76,7 +76,9 @@ const Cu = Components.utils; Cu.import("resource://gre/modules/Services.jsm"); Cu.import("resource://gre/modules/XPCOMUtils.jsm"); -Cu.import("resource://gre/modules/identity/IdentityUtils.jsm"); + +XPCOMUtils.defineLazyModuleGetter(this, "getRandomId", + "resource://gre/modules/identity/IdentityUtils.jsm"); XPCOMUtils.defineLazyModuleGetter(this, "IdentityService", "resource://gre/modules/identity/MinimalIdentity.jsm"); diff --git a/dom/identity/DOMIdentity.jsm b/dom/identity/DOMIdentity.jsm index 4ebd169773c6..1b713c56d3a2 100644 --- a/dom/identity/DOMIdentity.jsm +++ b/dom/identity/DOMIdentity.jsm @@ -11,7 +11,9 @@ this.EXPORTED_SYMBOLS = ["DOMIdentity"]; Cu.import("resource://gre/modules/Services.jsm"); Cu.import("resource://gre/modules/XPCOMUtils.jsm"); -Cu.import("resource://gre/modules/identity/IdentityUtils.jsm"); + +XPCOMUtils.defineLazyModuleGetter(this, "objectCopy", + "resource://gre/modules/identity/IdentityUtils.jsm"); XPCOMUtils.defineLazyModuleGetter(this, "IdentityService", #ifdef MOZ_B2G_VERSION diff --git a/dom/identity/nsDOMIdentity.js b/dom/identity/nsDOMIdentity.js index 9899a84f8f2c..a3edb7066f11 100644 --- a/dom/identity/nsDOMIdentity.js +++ b/dom/identity/nsDOMIdentity.js @@ -21,7 +21,13 @@ const MAX_RP_CALLS = 100; Cu.import("resource://gre/modules/Services.jsm"); Cu.import("resource://gre/modules/XPCOMUtils.jsm"); -Cu.import("resource://gre/modules/identity/IdentityUtils.jsm"); + +XPCOMUtils.defineLazyModuleGetter(this, "checkDeprecated", + "resource://gre/modules/identity/IdentityUtils.jsm"); +XPCOMUtils.defineLazyModuleGetter(this, "checkRenamed", + "resource://gre/modules/identity/IdentityUtils.jsm"); +XPCOMUtils.defineLazyModuleGetter(this, "objectCopy", + "resource://gre/modules/identity/IdentityUtils.jsm"); XPCOMUtils.defineLazyServiceGetter(this, "uuidgen", "@mozilla.org/uuid-generator;1", diff --git a/toolkit/identity/MinimalIdentity.jsm b/toolkit/identity/MinimalIdentity.jsm index 04958b4fd297..a48b5a11d33a 100644 --- a/toolkit/identity/MinimalIdentity.jsm +++ b/toolkit/identity/MinimalIdentity.jsm @@ -25,7 +25,9 @@ const Cr = Components.results; Cu.import("resource://gre/modules/XPCOMUtils.jsm"); Cu.import("resource://gre/modules/Services.jsm"); Cu.import("resource://gre/modules/identity/LogUtils.jsm"); -Cu.import("resource://gre/modules/identity/IdentityUtils.jsm"); + +XPCOMUtils.defineLazyModuleGetter(this, "objectCopy", + "resource://gre/modules/identity/IdentityUtils.jsm"); XPCOMUtils.defineLazyModuleGetter(this, "jwcrypto", diff --git a/toolkit/identity/RelyingParty.jsm b/toolkit/identity/RelyingParty.jsm index 2a26daca105b..4b1a80df5bfa 100644 --- a/toolkit/identity/RelyingParty.jsm +++ b/toolkit/identity/RelyingParty.jsm @@ -14,11 +14,13 @@ const Cr = Components.results; Cu.import("resource://gre/modules/XPCOMUtils.jsm"); Cu.import("resource://gre/modules/Services.jsm"); Cu.import("resource://gre/modules/identity/LogUtils.jsm"); -Cu.import("resource://gre/modules/identity/IdentityUtils.jsm"); Cu.import("resource://gre/modules/identity/IdentityStore.jsm"); this.EXPORTED_SYMBOLS = ["RelyingParty"]; +XPCOMUtils.defineLazyModuleGetter(this, "objectCopy", + "resource://gre/modules/identity/IdentityUtils.jsm"); + XPCOMUtils.defineLazyModuleGetter(this, "jwcrypto", "resource://gre/modules/identity/jwcrypto.jsm");