☠☠ backed out by 5c14c63b4c1a ☠ ☠ | |
author | Bobby Holley <bobbyholley@gmail.com> |
Wed, 01 Oct 2014 15:25:01 +0200 | |
changeset 208202 | e2528549de9de753470749e3684a241e75443a11 |
parent 208201 | 981c0b7c897d7a67e109b003364b9dd9a13c9628 |
child 208203 | 54d6077015dae167ca4f38ba2a2eee9cb6de6763 |
push id | 27580 |
push user | kwierso@gmail.com |
push date | Wed, 01 Oct 2014 23:26:55 +0000 |
treeherder | autoland@af6c928893c0 [default view] [failures only] |
perfherder | [talos] [build metrics] [platform microbench] (compared to previous push) |
reviewers | bz |
bugs | 1065185 |
milestone | 35.0a1 |
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
|
--- a/dom/bluetooth/tests/marionette/head.js +++ b/dom/bluetooth/tests/marionette/head.js @@ -38,18 +38,25 @@ const REMOTE_DEVICE_NAME = "Remote_BT_De // A system message signature of pairing request event const BT_PAIRING_REQ = "bluetooth-pairing-request"; // Passkey and pincode used to reply pairing requst const BT_PAIRING_PASSKEY = 123456; const BT_PAIRING_PINCODE = "ABCDEFG"; -let Promise = - SpecialPowers.Cu.import("resource://gre/modules/Promise.jsm").Promise; +// Emulate Promise.jsm semantics. +Promise.defer = function() { return new Deferred(); } +function Deferred() { + this.promise = new Promise(function(resolve, reject) { + this.resolve = resolve; + this.reject = reject; + }.bind(this)); + Object.freeze(this); +} let bluetoothManager; let pendingEmulatorCmdCount = 0; /** * Send emulator command with safe guard. *
--- a/dom/bluetooth2/tests/marionette/head.js +++ b/dom/bluetooth2/tests/marionette/head.js @@ -31,18 +31,25 @@ const EMULATOR_CLASS = 0x58020c; // which were defined at external/qemu/hw/bt.h: const BDADDR_ANY = "00:00:00:00:00:00"; const BDADDR_ALL = "ff:ff:ff:ff:ff:ff"; const BDADDR_LOCAL = "ff:ff:ff:00:00:00"; // A user friendly name for remote BT device. const REMOTE_DEVICE_NAME = "Remote_BT_Device"; -let Promise = - SpecialPowers.Cu.import("resource://gre/modules/Promise.jsm").Promise; +// Emulate Promise.jsm semantics. +Promise.defer = function() { return new Deferred(); } +function Deferred() { + this.promise = new Promise(function(resolve, reject) { + this.resolve = resolve; + this.reject = reject; + }.bind(this)); + Object.freeze(this); +} let bluetoothManager; let pendingEmulatorCmdCount = 0; /** * Push required permissions and test if |navigator.mozBluetooth| exists. * Resolve if it does, reject otherwise.
--- a/dom/cellbroadcast/tests/marionette/head.js +++ b/dom/cellbroadcast/tests/marionette/head.js @@ -1,14 +1,22 @@ /* Any copyright is dedicated to the Public Domain. * http://creativecommons.org/publicdomain/zero/1.0/ */ const {Cc: Cc, Ci: Ci, Cr: Cr, Cu: Cu} = SpecialPowers; -let Promise = Cu.import("resource://gre/modules/Promise.jsm").Promise; +// Emulate Promise.jsm semantics. +Promise.defer = function() { return new Deferred(); } +function Deferred() { + this.promise = new Promise(function(resolve, reject) { + this.resolve = resolve; + this.reject = reject; + }.bind(this)); + Object.freeze(this); +} const PDU_DCS_CODING_GROUP_BITS = 0xF0; const PDU_DCS_MSG_CODING_7BITS_ALPHABET = 0x00; const PDU_DCS_MSG_CODING_8BITS_ALPHABET = 0x04; const PDU_DCS_MSG_CODING_16BITS_ALPHABET = 0x08; const PDU_DCS_MSG_CLASS_BITS = 0x03; const PDU_DCS_MSG_CLASS_NORMAL = 0xFF;
--- a/dom/mobilemessage/tests/marionette/head.js +++ b/dom/mobilemessage/tests/marionette/head.js @@ -1,14 +1,22 @@ /* Any copyright is dedicated to the Public Domain. * http://creativecommons.org/publicdomain/zero/1.0/ */ const {Cc: Cc, Ci: Ci, Cr: Cr, Cu: Cu} = SpecialPowers; -let Promise = Cu.import("resource://gre/modules/Promise.jsm").Promise; +// Emulate Promise.jsm semantics. +Promise.defer = function() { return new Deferred(); } +function Deferred() { + this.promise = new Promise(function(resolve, reject) { + this.resolve = resolve; + this.reject = reject; + }.bind(this)); + Object.freeze(this); +} /** * Push a list of preference settings. Never reject. * * Fulfill params: (none) * * @param aPrefs * An JS object. For example:
--- a/dom/telephony/test/marionette/head.js +++ b/dom/telephony/test/marionette/head.js @@ -1,12 +1,21 @@ /* Any copyright is dedicated to the Public Domain. * http://creativecommons.org/publicdomain/zero/1.0/ */ -let Promise = SpecialPowers.Cu.import("resource://gre/modules/Promise.jsm").Promise; +// Emulate Promise.jsm semantics. +Promise.defer = function() { return new Deferred(); } +function Deferred() { + this.promise = new Promise(function(resolve, reject) { + this.resolve = resolve; + this.reject = reject; + }.bind(this)); + Object.freeze(this); +} + let telephony; let conference; const kPrefRilDebuggingEnabled = "ril.debugging.enabled"; /** * Emulator helper. */
--- a/dom/tethering/tests/marionette/head.js +++ b/dom/tethering/tests/marionette/head.js @@ -20,18 +20,25 @@ const TETHERING_SETTING_DNS2 = "8.8.4.4" * Wifi tethering setting. */ const TETHERING_SETTING_SSID = "FirefoxHotSpot"; const TETHERING_SETTING_SECURITY = "open"; const TETHERING_SETTING_KEY = "1234567890"; const SETTINGS_RIL_DATA_ENABLED = 'ril.data.enabled'; -let Promise = - SpecialPowers.Cu.import("resource://gre/modules/Promise.jsm").Promise; +// Emulate Promise.jsm semantics. +Promise.defer = function() { return new Deferred(); } +function Deferred() { + this.promise = new Promise(function(resolve, reject) { + this.resolve = resolve; + this.reject = reject; + }.bind(this)); + Object.freeze(this); +} let gTestSuite = (function() { let suite = {}; let tetheringManager; let pendingEmulatorShellCount = 0; /**
--- a/dom/voicemail/test/marionette/head.js +++ b/dom/voicemail/test/marionette/head.js @@ -3,17 +3,25 @@ "use strict"; const {Cc: Cc, Ci: Ci, Cr: Cr, Cu: Cu} = SpecialPowers; let RIL = {}; Cu.import("resource://gre/modules/ril_consts.js", RIL); -let Promise = Cu.import("resource://gre/modules/Promise.jsm").Promise; +// Emulate Promise.jsm semantics. +Promise.defer = function() { return new Deferred(); } +function Deferred() { + this.promise = new Promise(function(resolve, reject) { + this.resolve = resolve; + this.reject = reject; + }.bind(this)); + Object.freeze(this); +} const MWI_PDU_PREFIX = "0000"; const MWI_PDU_UDH_PREFIX = "0040"; const MWI_PID_DEFAULT = "00"; const MWI_DCS_DISCARD_INACTIVE = "C0"; const MWI_DCS_DISCARD_ACTIVE = "C8"; const MWI_TIMESTAMP = "00000000000000";
--- a/dom/wifi/test/marionette/head.js +++ b/dom/wifi/test/marionette/head.js @@ -1,12 +1,20 @@ /* Any copyright is dedicated to the Public Domain. * http://creativecommons.org/publicdomain/zero/1.0/ */ -let Promise = SpecialPowers.Cu.import('resource://gre/modules/Promise.jsm').Promise; +// Emulate Promise.jsm semantics. +Promise.defer = function() { return new Deferred(); } +function Deferred() { + this.promise = new Promise(function(resolve, reject) { + this.resolve = resolve; + this.reject = reject; + }.bind(this)); + Object.freeze(this); +} const STOCK_HOSTAPD_NAME = 'goldfish-hostapd'; const HOSTAPD_CONFIG_PATH = '/data/misc/wifi/remote-hostapd/'; const SETTINGS_RIL_DATA_ENABLED = 'ril.data.enabled'; const SETTINGS_TETHERING_WIFI_ENABLED = 'tethering.wifi.enabled'; const SETTINGS_TETHERING_WIFI_IP = 'tethering.wifi.ip'; const SETTINGS_TETHERING_WIFI_SECURITY = 'tethering.wifi.security.type';