Backed out 2 changesets (bug 1037030, bug 1037128) for mochitest failures.
authorRyan VanderMeulen <ryanvm@gmail.com>
Mon, 14 Jul 2014 14:19:02 -0400
changeset 215806 ae4192ba282468beca331e4a1b2b810cdf276f1f
parent 215805 be68df2bd1ba7a163d8e88bf63dd0c51fd83de41
child 215807 25deba1efeb4b9d956c226a0313224d7cddf555e
push id515
push userraliiev@mozilla.com
push dateMon, 06 Oct 2014 12:51:51 +0000
treeherdermozilla-release@267c7a481bef [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1037030, 1037128
milestone33.0a1
backs out1a9546b1b79d6b65b038e3329942281ccf89a467
bd68bbc99e5d5d190e834a3f7046172e04b24032
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Backed out 2 changesets (bug 1037030, bug 1037128) for mochitest failures. Backed out changeset 1a9546b1b79d (bug 1037128) Backed out changeset bd68bbc99e5d (bug 1037030)
dom/contacts/ContactManager.js
--- a/dom/contacts/ContactManager.js
+++ b/dom/contacts/ContactManager.js
@@ -245,47 +245,37 @@ ContactManager.prototype = {
     // Shortcut for ALLOW_ACTION so we avoid a parent roundtrip
     let principal = this._window.document.nodePrincipal;
     let type = "contacts-" + access;
     let permValue =
       Services.perms.testExactPermissionFromPrincipal(principal, type);
     if (permValue == Ci.nsIPermissionManager.ALLOW_ACTION) {
       aAllowCallback();
       return;
-    } else if (permValue == Ci.nsIPermissionManager.DENY_ACTION ||
-               permValue == Ci.nsIPermissionManager.UNKNOWN_ACTION) {
-       aCancelCallback();
-      return;
+    } else if (permValue == Ci.nsIPermissionManager.DENY_ACTION) {
+      aCancelCallback();
     }
 
     // Create an array with a single nsIContentPermissionType element.
     let type = {
       type: "contacts",
       access: access,
-      options: [],
+      options: null,
       QueryInterface: XPCOMUtils.generateQI([Ci.nsIContentPermissionType])
     };
     let typeArray = Cc["@mozilla.org/array;1"].createInstance(Ci.nsIMutableArray);
     typeArray.appendElement(type, false);
 
     // create a nsIContentPermissionRequest
     let request = {
       types: typeArray,
       principal: principal,
       QueryInterface: XPCOMUtils.generateQI([Ci.nsIContentPermissionRequest]),
-      allow: aAllowCallback ||
-             function() {
-               if (DEBUG)
-                 debug("Default allow contacts callback. " + access +"\n");
-             },
-      cancel: aCancelCallback ||
-              function() {
-                if (DEBUG)
-                  debug("Default cancel contacts callback. " + access +"\n");
-              },
+      allow: aAllowCallback,
+      cancel: aCancelCallback,
       window: this._window
     };
 
     // Using askPermission from nsIDOMWindowUtils that takes care of the
     // remoting if needed.
     let windowUtils = this._window.QueryInterface(Ci.nsIInterfaceRequestor)
                           .getInterface(Ci.nsIDOMWindowUtils);
     windowUtils.askPermission(request);