From 624074252ce7aa1b9c2959c1c485b87fda31d968 Mon Sep 17 00:00:00 2001 From: Bobby Holley Date: Thu, 5 Jun 2014 22:32:37 -0700 Subject: [PATCH] Bug 987111 - Temporarily waive Xrays on the aOptions argument passed to mozId.watch and mozId.request. r=jedp Bug 1011084 is getting hung up on various things, and we're currently blocked on it because Object Xrays filter out callables. So let's just turn off Xrays here for that case, so that we can enable them everywhere else. --- dom/identity/nsDOMIdentity.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dom/identity/nsDOMIdentity.js b/dom/identity/nsDOMIdentity.js index 35cbef5e61d..5e4597ccb9b 100644 --- a/dom/identity/nsDOMIdentity.js +++ b/dom/identity/nsDOMIdentity.js @@ -102,6 +102,7 @@ nsDOMIdentity.prototype = { */ watch: function nsDOMIdentity_watch(aOptions = {}) { + aOptions = Cu.waiveXrays(aOptions); if (this._rpWatcher) { // For the initial release of Firefox Accounts, we support callers who // invoke watch() either for Firefox Accounts, or Persona, but not both. @@ -153,6 +154,7 @@ nsDOMIdentity.prototype = { }, request: function nsDOMIdentity_request(aOptions = {}) { + aOptions = Cu.waiveXrays(aOptions); this._log("request: " + JSON.stringify(aOptions)); // Has the caller called watch() before this?